File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -34,6 +34,14 @@ class YamlTests
34
34
const TEMPLATE_FUNCTION_SKIPPED = __DIR__ . '/template/test/function-skipped ' ;
35
35
const ELASTICSEARCH_GIT_URL = 'https://github.com/elastic/elasticsearch/tree/%s/rest-api-spec/src/main/resources/rest-api-spec/test/%s ' ;
36
36
37
+ <<<<<<< HEAD
38
+ =======
39
+ const YAML_FILES_TO_OMIT = [
40
+ 'platinum/eql/10_basic.yml ' ,
41
+ 'free/cluster.desired_nodes/10_basic.yml ' , // use of _internal API
42
+ ];
43
+
44
+ >>>>>>> 4 f2937d8... Removed _internal YAML tests
37
45
const SKIPPED_TEST_OSS = [
38
46
'Cat\Nodeattrs\_10_BasicTest::TestCatNodesAttrsOutput ' => 'Regexp error, it seems not compatible with PHP ' ,
39
47
'Cat\Shards\_10_BasicTest::TestCatShardsOutput ' => 'Regexp error, it seems not compatible with PHP ' ,
You can’t perform that action at this time.
0 commit comments