From 146397c1899e5f6ff3e0f96702b6486576446395 Mon Sep 17 00:00:00 2001 From: Zachary Tong Date: Mon, 24 Mar 2014 17:54:44 -0400 Subject: [PATCH] [TEST] Fix for unescaped regex in tests PHP doesn't like unescaped forward slashes that some tests use. This commit removes the beginning/end slash and replaces them with a new delimeter --- tests/Elasticsearch/Tests/YamlRunnerTest.php | 8 +++++++- util/elasticsearch | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php index 9a744b48f..8fd4d6af8 100644 --- a/tests/Elasticsearch/Tests/YamlRunnerTest.php +++ b/tests/Elasticsearch/Tests/YamlRunnerTest.php @@ -131,7 +131,13 @@ private function assertFalsey($value) } private function assertRegex($pattern, $actual) { - $pattern .= "mx"; + $pattern = trim($pattern); + + // PHP doesn't like unescaped forward slashes, switch to a new delimeter + // to make life easier + $pattern = substr($pattern, 1, strlen($pattern)-2); + $pattern = "%$pattern%mx"; + ob_flush(); $result = preg_match($pattern, $actual, $matches); $this->assertEquals(1, $result); diff --git a/util/elasticsearch b/util/elasticsearch index 992747a15..8a60dacb3 160000 --- a/util/elasticsearch +++ b/util/elasticsearch @@ -1 +1 @@ -Subproject commit 992747a159ced8ec9c3eb4d2b99b852ce8f626c1 +Subproject commit 8a60dacb3df5feb1f5f0aad60334d6a220a0a73c