Reapply the YAML_FILES_TO_OMIT for Internal tests

elastic · May 3, 2022 · c75d7ff · c75d7ff
1 parent 70371ee
commit c75d7ff
Showing 1 changed file with 30 additions and 10 deletions.
diff --git a/util/YamlTests.php b/util/YamlTests.php
@@ -22,6 +22,7 @@
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use stdClass;
+use Throwable;
 
 use function yaml_parse;
 
@@ -147,22 +148,41 @@ private function getAllTests(string $dir): array
         $parsed = [];
         // Iterate over the Yaml test files
         foreach (new RecursiveIteratorIterator($it) as $file) {
-            if ($file->getExtension() === 'yml') {
-                $content = file_get_contents($file->getPathname());
-                $content = str_replace(' y: ', " 'y': ", $content); // replace "y:" with "'y':" due the y/true conversion in YAML 1.1
+            if ($file->getExtension() !== 'yml') {
+                continue;
+            }
+            $omit = false;
+            foreach (self::YAML_FILES_TO_OMIT as $fileOmit) {
+                if (false !== strpos($file->getPathname(), $fileOmit)) {
+                    $omit = true;
+                    break;
+                }
+            }
+            if ($omit) {
+                continue;
+            }
+            $content = file_get_contents($file->getPathname());
+            $content = str_replace(' y: ', " 'y': ", $content); // replace "y:" with "'y':" due the y/true conversion in YAML 1.1
+            try {
                 $test = yaml_parse($content, -1, $ndocs, [
                     YAML_MAP_TAG => function($value, $tag, $flags) {
                         return empty($value) ? new stdClass : $value;
                     }
                 ]);
-                if (false === $test) {
-                    throw new Exception(sprintf(
-                        "YAML parse error file %s",
-                        $file->getPathname()
-                    ));
-                }
-                $parsed[$file->getPathname()] = $test;
+            } catch (Throwable $e) {
+                throw new Exception(sprintf(
+                    "YAML parse error file %s: %s",
+                    $file->getPathname(),
+                    $e->getMessage()
+                ));
+            }
+            if (false === $test) {
+                throw new Exception(sprintf(
+                    "YAML parse error file %s",
+                    $file->getPathname()
+                ));
             }
+            $parsed[$file->getPathname()] = $test;
         }
         return $parsed;
     }