Merge lp:~kdub/mir/fix-1602646 into lp:mir

[Kevin DuBois]

fix LP: #1602646 by synchronizing expectations on both clients. under load, sometimes the host to client instance could receive events after

fixes: LP: #1602646

fix LP: #1602646 by synchronizing expectations on both clients. under load, sometimes the host to client instance could receive events after

fixes: LP: #1602646

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

FAILED: Continuous integration, rev:3586
https://mir-jenkins.ubuntu.com/job/mir-ci/1276/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1494/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1547
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1538
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1538
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1538
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1509/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/1509/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1509/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1509/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/1509
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1509/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/1509/console

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

review: Needs Fixing (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

Ok I could reproduce cases where the clients would still receive events while the test is shutting down. But it does not occur anymore with this MP.

review: Approve

[Daniel van Vugt (vanvugt)]

review: Approve

=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
--- tests/acceptance-tests/test_nested_input.cpp	2016-07-06 21:47:33 +0000
+++ tests/acceptance-tests/test_nested_input.cpp	2016-07-13 13:20:13 +0000
@@ -279,6 +279,8 @@
 
 TEST_F(NestedInput, on_input_device_state_nested_server_emits_input_device_state)
 {
+    mir::test::Signal client_to_host_event_received;
+    mir::test::Signal client_to_nested_event_received;
     MockEventFilter nested_event_filter;
     NestedServerWithMockEventFilter nested_mir{new_connection(), mt::fake_shared(nested_event_filter)};
     ExposedSurface client_to_nested_mir(nested_mir.new_connection());
@@ -287,13 +289,15 @@
     ExposedSurface client_to_host(new_connection());
     client_to_host.ready_to_accept_events.wait_for(1s);
 
-    EXPECT_CALL(client_to_host, handle_input(mt::KeyOfScanCode(KEY_LEFTALT)));
+    EXPECT_CALL(client_to_host, handle_input(mt::KeyOfScanCode(KEY_LEFTALT)))
+        .WillOnce(mt::WakeUp(&client_to_host_event_received));
     EXPECT_CALL(nested_event_filter,
                 handle(mt::DeviceStateWithPressedKeys(std::vector<uint32_t>({KEY_LEFTALT, KEY_TAB}))))
-        .WillOnce(DoAll(mt::WakeUp(&all_events_received), Return(true)));
+        .WillOnce(DoAll(mt::WakeUp(&client_to_nested_event_received), Return(true)));
 
     fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_LEFTALT));
     fake_keyboard->emit_event(mis::a_key_down_event().of_scancode(KEY_TAB));
 
-    all_events_received.wait_for(2s);
+    client_to_nested_event_received.wait_for(2s);
+    client_to_host_event_received.wait_for(2s);
 }