summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-10-01 20:29:44 +0200
committerKonstantin Käfer <mail@kkaefer.com>2015-10-01 21:18:27 +0200
commit80374b3ecbb0403fc024d2fc6ecd6ba467b26126 (patch)
tree93542b26af770605f336d9c519cbe4329a993926 /test
parentab6090fccb09ff3749c381137ffaa8eca4b7a82a (diff)
downloadqtlocation-mapboxgl-80374b3ecbb0403fc024d2fc6ecd6ba467b26126.tar.gz
[osx] OS X 10.11 returns another error string
Diffstat (limited to 'test')
-rw-r--r--test/storage/http_error.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/storage/http_error.cpp b/test/storage/http_error.cpp
index eeb8117a09..be2811cd06 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 << "\"";