Skip to content

Commit ebd7dc1

Browse files
committed
Updated test code generator with better is-null support
1 parent b72b9b0 commit ebd7dc1

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

tests/Elasticsearch/Tests/Utility.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,16 @@ private static function wipeCluster(Client $client): void
352352
if (getenv('TEST_SUITE') === 'xpack') {
353353
self::wipeRollupJobs($client);
354354
self::waitForPendingRollupTasks($client);
355+
356+
self::deleteAllSLMPolicies($client);
355357
}
356-
self::deleteAllSLMPolicies($client);
357358

358359
self::wipeSnapshots($client);
359-
self::wipeDataStreams($client);
360+
361+
if (getenv('TEST_SUITE') === 'xpack') {
362+
self::wipeDataStreams($client);
363+
}
364+
360365
self::wipeAllindices($client);
361366

362367
if (getenv('TEST_SUITE') === 'xpack') {

util/YamlTests.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class YamlTests
3838
const SKIPPED_TEST_OSS = [
3939
'Cat\Nodeattrs\_10_BasicTest::TestCatNodesAttrsOutput' => 'Regexp error, it seems not compatible with PHP',
4040
'Cat\Shards\_10_BasicTest::TestCatShardsOutput' => 'Regexp error, it seems not compatible with PHP',
41+
'Indices\Create\_20_Mix_Typeless_TypefulTest::CreateATypedIndexWhileThereIsATypelessTemplate' => 'mismatch on warning header',
4142
'Search\Aggregation\_10_HistogramTest::HistogramProfiler' => "Error reading 'n' field from YAML",
4243
];
4344

util/template/test/is-null

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
$this->assertNull($response:value);
1+
if (isset($response:value)) {
2+
$this->assertNull($response:value);
3+
} else {
4+
$this->assertTrue(true);
5+
}

0 commit comments

Comments
 (0)