Merge lp:~vanvugt/mir/fix-1252144.trunk into lp:mir/0.1

[Daniel van Vugt]

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

Proposing this to lp:mir first, because that's where it's immediately required. And I can't reproduce the bug to verify the fix works yet anyway. So we need Jenkins to try it on lp:mir for verification.

[Daniel van Vugt (vanvugt)]

Actually this is probably way off the mark. The failing test only takes 1ms to fail.

review: Disapprove

[Daniel van Vugt (vanvugt)]

Traced through the failing logic and now I can't see any other logical explanation than a timeout. Which also means the test log claiming it only took 1ms is either inaccurate or the timing on the host is broken.

review: Abstain

[Daniel van Vugt (vanvugt)]

OK, if I modify the code to force a timeout then it indeed does fail like in bug 1252144.

[Timo Jyrinki (timo-jyrinki)]

Looking good, built in a PPA with all tests passed for x86: https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-daily/+sourcepub/3666854/+listing-archive-extra

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1164
http://jenkins.qa.ubuntu.com/job/mir-ci/1616/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/180
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-ci/14/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-ci/14/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/1616/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/720/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/3223/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/181
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/9/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/9/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

It appears to just be the build machines timing out, and no build or test failures :(

[Timo Jyrinki (timo-jyrinki)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/721/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/3229/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/184
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/10/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/10/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Reported the problems to CI team, meanwhile just trying again

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/722/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/generic-cleanup-mbs/3233/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/190/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/187
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-amd64-autolanding/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/11/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-trusty-armhf-autolanding/11/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Timo Jyrinki (timo-jyrinki)]

Merged manually as CI still not working.

review: Approve

=== modified file 'tests/unit-tests/frontend/test_published_socket_connector.cpp'
--- tests/unit-tests/frontend/test_published_socket_connector.cpp	2013-11-06 03:17:35 +0000
+++ tests/unit-tests/frontend/test_published_socket_connector.cpp	2013-11-18 06:14:49 +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);