From d299c6143e6e87b3606c28f57b66d4c3a70a724e Mon Sep 17 00:00:00 2001 From: Zachary Tong Date: Mon, 14 Apr 2014 16:13:23 -0400 Subject: [PATCH] [TEST] Properly handle 5xx errors when `request` is being caught --- tests/Elasticsearch/Tests/YamlRunnerTest.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php index b47ed0448..779dd1e78 100644 --- a/tests/Elasticsearch/Tests/YamlRunnerTest.php +++ b/tests/Elasticsearch/Tests/YamlRunnerTest.php @@ -373,6 +373,16 @@ private function executeTestCase($test, $testFile) } $response = array(); + } catch (ServerErrorResponseException $exception){ + if ($expectedError === 'request') { + $this->assertTrue(true); + } elseif (isset($expectedError) === true && preg_match("/$expectedError/", $exception->getMessage()) === 1) { + $this->assertTrue(true); + } else { + $this->fail($exception->getMessage()); + } + $response = array(); + } catch (Elasticsearch\Common\Exceptions\RuntimeException $exception){ if ($expectedError === 'param') { $this->assertTrue(true);