[TEST] Fix bug where skips in setup are ignored

A semi-recent refactor of the setup code forgot to handle skips that might occur in the setup. This commit fixes the handling of those skips
elastic · Apr 8, 2014 · 21c8698 · 21c8698
1 parent f1092c5
commit 21c8698
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php
@@ -249,7 +249,12 @@ public function testYaml()
                 $this->clearCluster();
 
                 if ($setup !== null) {
-                    $this->executeTestCase($setup, $testFile);
+                    try {
+                        $this->executeTestCase($setup, $testFile);
+                    } catch (SetupSkipException $e) {
+                        break;  //exit this test since we skipped in the setup
+                    }
+
                 }
                $this->executeTestCase($doc['values'], $testFile);