Merge lp:~afrantzis/mir/fix-1613523-nested-input-test into lp:mir

[Alexandros Frantzis]

tests: Wait for the input-device-state event before emitting key events to avoid receiving them out of order (LP: #1613523)

tests: Wait for the input-device-state event before emitting key events to avoid receiving them out of order (LP: #1613523)

Since I was in the area, I also increased the key event timeout to improve our chances of coping with a heavy load in CI.

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

PASSED: Continuous integration, rev:4085
https://mir-jenkins.ubuntu.com/job/mir-ci/3156/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4235
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4322
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4312
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4312
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4312
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4262
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4262/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/4262
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4262/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4262
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4262/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/4262
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4262/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/4262
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4262/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4262
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4262/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

[Andreas Pokorny (andreas-pokorny)]

ok

review: Approve

=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
--- tests/acceptance-tests/test_nested_input.cpp	2017-02-15 07:38:33 +0000
+++ tests/acceptance-tests/test_nested_input.cpp	2017-03-14 14:03:55 +0000
@@ -240,9 +240,11 @@
     MockEventFilter nested_event_filter;
     std::atomic<int> num_key_a_events{0};
     auto const increase_key_a_events = [&num_key_a_events] { ++num_key_a_events; };
+    mt::Signal devices_ready;
 
     InSequence seq;
-    EXPECT_CALL(nested_event_filter, handle(mt::InputDeviceStateEvent()));
+    EXPECT_CALL(nested_event_filter, handle(mt::InputDeviceStateEvent()))
+        .WillOnce(DoAll(mt::WakeUp(&devices_ready), Return(true)));
     EXPECT_CALL(nested_event_filter, handle(mt::KeyOfScanCode(KEY_A))).
         Times(AtLeast(1)).
         WillRepeatedly(DoAll(InvokeWithoutArgs(increase_key_a_events), Return(true)));
@@ -255,6 +257,8 @@
     NestedServerWithMockEventFilter nested_mir{new_connection(), mt::fake_shared(nested_event_filter)};
     ExposedSurface client(nested_mir.new_connection());
 
+    ASSERT_TRUE(devices_ready.wait_for(60s));
+
     // Because we are testing a nested setup, it's difficult to guarantee
     // that the nested framebuffer window (and consenquently the client window
     // contained in it) is going to be ready (i.e., exposed and focused) to receive
@@ -268,7 +272,7 @@
             fake_keyboard->emit_event(mis::a_key_up_event().of_scancode(KEY_A));
             return false;
         },
-        std::chrono::seconds{5});
+        std::chrono::seconds{10});
 
     EXPECT_TRUE(dummy_events_received);