Merge lp:~vanvugt/mir/fix-1252144 into lp:mir

[Daniel van Vugt]

Bump timeouts used in socket testing. It seems 100ms isn't always enough,
which leads to spurious test failures (LP: #1252144)

This proposal has already landed on lp:mir, in a rush to fix the failure blocking package release.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1228
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/391/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/205
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/202
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/120/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-team-mir-development-branch-ci/391/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

Despite having landed in lp:mir already, this fix doesn't work.
https://bugs.launchpad.net/mir/+bug/1252144/comments/7

review: Disapprove

=== modified file 'tests/unit-tests/frontend/test_published_socket_connector.cpp'
--- tests/unit-tests/frontend/test_published_socket_connector.cpp	2013-10-24 14:22:27 +0000
+++ tests/unit-tests/frontend/test_published_socket_connector.cpp	2013-11-18 06:44:32 +0000
@@ -46,6 +46,8 @@
 
 namespace
 {
+const int timeout_ms = 60 * 1000;
+
 class MockConnectorReport : public mf::ConnectorReport
 {
 public:
@@ -96,7 +98,7 @@
             communicator_report);
 
         stub_server->comm->start();
-        client = std::make_shared<mt::TestProtobufClient>(test_socket, 100);
+        client = std::make_shared<mt::TestProtobufClient>(test_socket, timeout_ms);
         client->connect_parameters.set_application_name(__PRETTY_FUNCTION__);
     }
 
@@ -425,7 +427,7 @@
     int const next_buffer_calls{8};
     char buffer[128] = {0};
     sprintf(buffer, "fd://%d", stub_server->comm->client_socket_fd());
-    auto client = std::make_shared<mt::TestProtobufClient>(buffer, 100);
+    auto client = std::make_shared<mt::TestProtobufClient>(buffer, timeout_ms);
     client->connect_parameters.set_application_name(__PRETTY_FUNCTION__);
 
     EXPECT_CALL(*client, connect_done()).Times(1);