From 6774629898f86f2f67bd595c768a6c691f0679ee Mon Sep 17 00:00:00 2001 From: Teju Nareddy Date: Sat, 20 Feb 2021 17:23:07 -0800 Subject: [PATCH 1/2] Remove strict equality for error message Signed-off-by: Teju Nareddy --- test/server/http_test_server_filter_integration_test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/server/http_test_server_filter_integration_test.cc b/test/server/http_test_server_filter_integration_test.cc index db2233ff5..b06e68539 100644 --- a/test/server/http_test_server_filter_integration_test.cc +++ b/test/server/http_test_server_filter_integration_test.cc @@ -296,9 +296,9 @@ TEST(HttpTestServerDecoderFilterTest, HeaderMerge) { {":status", "200"}, {"foo", "bar2"}, {"foo2", "bar3"}})); EXPECT_FALSE(Server::Configuration::mergeJsonConfig("bad_json", options, error_message)); - EXPECT_EQ("Error merging json config: Unable to parse JSON as proto (INVALID_ARGUMENT:Unexpected " - "token.\nbad_json\n^): bad_json", - error_message); + EXPECT_THAT(error_message, + testing::HasSubstr("Error merging json config: Unable to parse JSON as proto " + "(INVALID_ARGUMENT: Unexpected token.\nbad_json\n^): bad_json")); EXPECT_EQ(3, options.response_headers_size()); } From 319c907f9c01fc073ade2df161b92d699a8c3d0e Mon Sep 17 00:00:00 2001 From: Teju Nareddy Date: Sat, 20 Feb 2021 20:43:51 -0800 Subject: [PATCH 2/2] Fix test Signed-off-by: Teju Nareddy --- test/server/http_test_server_filter_integration_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/server/http_test_server_filter_integration_test.cc b/test/server/http_test_server_filter_integration_test.cc index b06e68539..3e246e64a 100644 --- a/test/server/http_test_server_filter_integration_test.cc +++ b/test/server/http_test_server_filter_integration_test.cc @@ -298,7 +298,7 @@ TEST(HttpTestServerDecoderFilterTest, HeaderMerge) { EXPECT_FALSE(Server::Configuration::mergeJsonConfig("bad_json", options, error_message)); EXPECT_THAT(error_message, testing::HasSubstr("Error merging json config: Unable to parse JSON as proto " - "(INVALID_ARGUMENT: Unexpected token.\nbad_json\n^): bad_json")); + "(INVALID_ARGUMENT:Unexpected token.\nbad_json\n^): bad_json")); EXPECT_EQ(3, options.response_headers_size()); }