From 80374b3ecbb0403fc024d2fc6ecd6ba467b26126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Thu, 1 Oct 2015 20:29:44 +0200 Subject: [PATCH] [osx] OS X 10.11 returns another error string --- test/storage/http_error.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp index eeb8117a0..be2811cd0 100644 --- a/test/storage/http_error.cpp +++ b/test/storage/http_error.cpp @@ -47,7 +47,10 @@ TEST_F(Storage, HTTPError) { EXPECT_GT(1.7, duration) << "Resource wasn't retried the correct number of times"; EXPECT_EQ(Response::Error, res.status); #ifdef MBGL_HTTP_NSURL - EXPECT_STREQ(res.message.c_str(), "The operation couldn’t be completed. (NSURLErrorDomain error -1004.)"); + EXPECT_TRUE(res.message == + "The operation couldn’t be completed. (NSURLErrorDomain error -1004.)" || + res.message == "Could not connect to the server.") + << "Full message is: \"" << res.message << "\""; #elif MBGL_HTTP_CURL const std::string prefix { "Couldn't connect to server: " }; EXPECT_STREQ(prefix.c_str(), res.message.substr(0, prefix.size()).c_str()) << "Full message is: \"" << res.message << "\"";