Merge lp:~michihenning/unity-scopes-api/fix-dns-timeout into lp:unity-scopes-api

[Michi Henning]

Fixed sporadic failure in JsonAsyncReader test caused by slow DNS.
Improved tests to report exception details if an exception other than
the expected one is thrown.

Fixed sporadic failure in JsonAsyncReader test caused by slow DNS.
Improved tests to report exception details if an exception other than
the expected one is thrown.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:312
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/574/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/99
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/99/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/100

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/574/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp'
--- test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp	2014-12-18 09:44:25 +0000
+++ test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp	2015-02-12 00:22:37 +0000
@@ -35,8 +35,7 @@
 
 class ExceptionsTest : public ::testing::Test
 {
-protected:
-    virtual void SetUp()
+protected: virtual void SetUp()
     {
         fake_server_ = posix::exec(FAKE_SERVER, {}, {}, posix::StandardStream::stdout);
 
@@ -104,14 +103,14 @@
         auto items = HttpAsyncReader::get_or_throw(reader_future);
         FAIL();
     }
-    catch (unity::LogicException& e)
+    catch (unity::LogicException const& e)
     {
         std::string error_msg = e.what();
         EXPECT_EQ(error_msg.find("<title>404 Not Found</title>") != std::string::npos, true);
     }
-    catch (...)
+    catch (std::exception const& e)
     {
-        FAIL();
+        FAIL() << e.what();
     }
 }
 TEST(BadUrlException, state)
@@ -125,14 +124,18 @@
         auto items = HttpAsyncReader::get_or_throw(reader_future);
         FAIL();
     }
-    catch (unity::LogicException& e)
+    catch (unity::LogicException const& e)
     {
         std::string error_msg = e.what();
         EXPECT_EQ(error_msg.find("Couldn't resolve host name") != std::string::npos, true);
     }
-    catch (...)
-    {
-        FAIL();
+    catch (unity::scopes::TimeoutException const&)
+    {
+        // This can happen occasionally when DNS is slow
+    }
+    catch (std::exception const& e)
+    {
+        FAIL() << e.what();
     }
 }
 
@@ -179,15 +182,15 @@
         JsonReader::QJsonDocumentSptr doc = reader.read(QString(fake_server_host.c_str()), parameters);
         FAIL();
     }
-    catch (unity::LogicException& e)
+    catch (unity::LogicException const& e)
     {
         std::string error_msg = e.what();
         EXPECT_EQ(error_msg.find("error obtaining parser: JsonAsyncReader::create_parser_with_data: illegal value") !=
                       std::string::npos,
                   true);
     }
-    catch (...)
+    catch (std::exception const& e)
     {
-        FAIL();
+        FAIL() << e.what();
     }
 }

=== modified file 'test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp'
--- test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp	2015-02-04 20:57:38 +0000
+++ test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp	2015-02-12 00:22:37 +0000
@@ -117,14 +117,14 @@
         auto items = HttpAsyncReader::get_or_throw(reader_future);
         FAIL();
     }
-    catch (unity::LogicException& e)
+    catch (unity::LogicException const& e)
     {
         std::string error_msg = e.what();
         EXPECT_EQ(error_msg.find("Couldn't resolve host name") != std::string::npos, true);
     }
-    catch (...)
+    catch (std::exception const& e)
     {
-        FAIL();
+        FAIL() << e.what();
     }
 }
 
@@ -205,7 +205,7 @@
         auto reader_future = reader.async_get<Client::Result>(fake_server_host.c_str(), parameters, "track");
         auto items = HttpAsyncReader::get_or_throw(reader_future, 10);
     }
-    catch (unity::LogicException& e)
+    catch (unity::LogicException const& e)
     {
         EXPECT_STREQ(e.what(),
                      "unity::LogicException: AsyncReader::async_get: error parsing data: get_results: ERROR: Opening "