Merge lp:~albaguirre/mir/fix-1643432 into lp:mir

[Alberto Aguirre]

tests: NestedServer: Wait to receive session_disconnect_called before
stopping the server

Make the test wait until session_disconnect_called is received before
stopping the server, avoiding a race between stopping the main loop and
the main loop dispatching the session_disconnect_called call.
(LP: #1643432)

[Daniel van Vugt (vanvugt)]

Sure. Land it now, ask forgiveness later.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3959
https://mir-jenkins.ubuntu.com/job/mir-ci/2766/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3626/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3701
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3691
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3691
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3691
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3653/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3653/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3653/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3653/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3653
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3653/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3653/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2766/rebuild

review: Needs Fixing (continuous-integration)

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2017-01-18 13:59:18 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2017-01-19 04:36:38 +0000
@@ -738,11 +738,16 @@
 
 TEST_F(NestedServer, nested_platform_connects_and_disconnects)
 {
+    mt::Signal signal;
     InSequence seq;
     EXPECT_CALL(*mock_session_mediator_report, session_connect_called(_)).Times(1);
-    EXPECT_CALL(*mock_session_mediator_report, session_disconnect_called(_)).Times(1);
+    EXPECT_CALL(*mock_session_mediator_report, session_disconnect_called(_))
+        .Times(1)
+        .WillOnce(mt::WakeUp(&signal));
 
     NestedMirRunner{new_connection()};
+
+    EXPECT_TRUE(signal.wait_for(30s));
 }
 
 TEST_F(NestedServerWithTwoDisplays, sees_expected_outputs)