Merge lp:~mir-team/mir/fix-1364772 into lp:mir

[Daniel van Vugt]

Work around spurious SIGKILL delivered to clients by Valgrind during
tests. This is why CI is failing randomly (LP: #1364772)

Actually this workaround is nothing new. A quick grep shows we already
use the same hack in 13 other locations under tests/.

[Chris Halse Rogers (raof)]

Yeah, fair enough.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1887
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2607/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1598
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1604
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1580
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1129
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/517
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/517/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2644
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12612

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

We should consider exposing a matcher to deduplicate the workaround logic, e.g., like the ValgrindSafeSignalMatches matcher proposed in https://code.launchpad.net/~kdub/mir/ignore-sigkill-for-valgrind/+merge/233270 .

review: Approve

[Chris Halse Rogers (raof)]

Do we have any idea why valgrind sometimes, but not always,
transliterates signals into SIGKILL?

[Daniel van Vugt (vanvugt)]

No, but it has been doing so for a long time.

=== modified file 'tests/acceptance-tests/test_server_disconnect.cpp'
--- tests/acceptance-tests/test_server_disconnect.cpp	2014-09-01 04:53:25 +0000
+++ tests/acceptance-tests/test_server_disconnect.cpp	2014-09-04 03:51:46 +0000
@@ -226,6 +226,7 @@
         ASSERT_EQ(1, client_results.size());
         EXPECT_EQ(mtf::TerminationReason::child_terminated_by_signal,
                   client_results[0].reason);
-        EXPECT_EQ(SIGHUP, client_results[0].signal);
+        int sig = client_results[0].signal;
+        EXPECT_TRUE(sig == SIGHUP || sig == SIGKILL /* (Valgrind) */);
     });
 }