[TEST] Fix teardown in yaml runner

Also include a quick fix for some malformed upstream yaml tests
elastic · Jan 7, 2019 · 098030e · 098030e
1 parent 46d5a7a
commit 098030e
Showing 1 changed file with 24 additions and 5 deletions.
diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php
@@ -142,7 +142,7 @@ public function setUp()
      * @dataProvider yamlProvider
      * @group sync
      */
-    public function testIntegration($testProcedure, $skip, $setupProcedure, $fileName)
+    public function testIntegration($testProcedure, bool $skip, $setupProcedure, $teardownProcedure, string $fileName)
     {
         if ($skip) {
             static::markTestIncomplete($testProcedure);
@@ -157,14 +157,21 @@ public function testIntegration($testProcedure, $skip, $setupProcedure, $fileNam
             $this->waitForYellow();
         }
 
-        $this->processProcedure(current($testProcedure), key($testProcedure), $fileName);
+        try {
+            $this->processProcedure(current($testProcedure), key($testProcedure), $fileName);
+        } finally {
+            if (null !== $teardownProcedure) {
+                $this->processProcedure(current($teardownProcedure), 'teardown', $fileName);
+                $this->waitForYellow();
+            }
+        }
     }
 
     /**
      * @dataProvider yamlProvider
      * @group async
      */
-    public function testAsyncIntegration($testProcedure, $skip, $setupProcedure, $fileName)
+    public function testAsyncIntegration($testProcedure, bool $skip, $setupProcedure, $teardownProcedure, string $fileName)
     {
         if ($skip) {
             static::markTestIncomplete($testProcedure);
@@ -179,7 +186,14 @@ public function testAsyncIntegration($testProcedure, $skip, $setupProcedure, $fi
             $this->waitForYellow();
         }
 
-        $this->processProcedure(current($testProcedure), key($testProcedure), $fileName, true);
+        try {
+            $this->processProcedure(current($testProcedure), key($testProcedure), $fileName, true);
+        } finally {
+            if (null !== $teardownProcedure) {
+                $this->processProcedure(current($teardownProcedure), 'teardown', $fileName);
+                $this->waitForYellow();
+            }
+        }
     }
 
     /**
@@ -918,6 +932,7 @@ private function splitDocument($file, $path, $filter = null)
         $documentsParsed = [];
         $setup = null;
         $setupSkip = false;
+        $teardown = null;
         $fileName = str_replace($path . '/', '', $file);
 
         if (array_key_exists($fileName, static::$fatalFiles)) {
@@ -931,6 +946,8 @@ private function splitDocument($file, $path, $filter = null)
         $skip = false;
         $documentParsed = null;
         foreach ($documents as $documentString) {
+            // TODO few bad instances of teardown, should be fixed in upstream but this is a quick fix locally
+            $documentString = str_replace(" teardown:", "teardown:", $documentString);
             try {
                 if (!$setupSkip) {
                     $documentParsed = $this->yaml->parse($documentString, false, false, true);
@@ -965,8 +982,10 @@ private function splitDocument($file, $path, $filter = null)
             if (!$skip && key($documentParsed) === 'setup') {
                 $setup = $documentParsed;
                 $setupSkip = $skip;
+            } elseif (!$teardown && key($documentParsed) === 'teardown') {
+                $teardown = $documentParsed;
             } else {
-                $documentsParsed[] = [$documentParsed, $skip || $setupSkip, $setup, $fileName];
+                $documentsParsed[] = [$documentParsed, $skip || $setupSkip, $setup, $teardown, $fileName];
             }
         }