Merge lp:~afrantzis/mir/fix-1318587 into lp:mir

[Alexandros Frantzis]

tests: Allow more time for event handling to happen before leaving the CustomInputDispatcherFixture.custom_input_dispatcher_receives_input test

tests: Allow more time for event handling to happen before leaving the CustomInputDispatcherFixture.custom_input_dispatcher_receives_input test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1619
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1590/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/109
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/109/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/336
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1404
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7053

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

looks okay

review: Approve

[Alberto Aguirre (albaguirre)]

ok

review: Approve

=== modified file 'tests/acceptance-tests/test_custom_input_dispatcher.cpp'
--- tests/acceptance-tests/test_custom_input_dispatcher.cpp	2014-05-09 09:56:45 +0000
+++ tests/acceptance-tests/test_custom_input_dispatcher.cpp	2014-05-12 12:20:04 +0000
@@ -23,6 +23,7 @@
 
 #include "mir_test_framework/display_server_test_fixture.h"
 #include "mir_test_framework/input_testing_server_configuration.h"
+#include "mir_test_framework/cross_process_sync.h"
 #include "mir_test_doubles/mock_input_dispatcher.h"
 #include "mir_test/fake_shared.h"
 #include "mir_test/fake_event_hub.h"
@@ -108,7 +109,8 @@
                     using namespace ::testing;
                     InSequence seq;
                     EXPECT_CALL(dispatcher_conf->dispatcher, dispatch(mt::MotionEventWithPosition(1, 1))).Times(1);
-                    EXPECT_CALL(dispatcher_conf->dispatcher, dispatch(mt::KeyDownEvent())).Times(1);
+                    EXPECT_CALL(dispatcher_conf->dispatcher, dispatch(mt::KeyDownEvent()))
+                        .WillOnce(InvokeWithoutArgs([this] { dispatching_done.signal_ready(); }));
                 }
 
                 return dispatcher_conf;
@@ -119,9 +121,19 @@
             fake_event_hub->synthesize_event(mis::a_motion_event().with_movement(1, 1));
             fake_event_hub->synthesize_event(mis::a_key_down_event().of_scancode(KEY_ENTER));
         }
+
+        mtf::CrossProcessSync dispatching_done;
     } server_config;
 
     launch_server_process(server_config);
+
+    // Since event handling happens asynchronously we need to allow some time
+    // for it to take place before we leave the test. Otherwise, the server
+    // may be stopped before events have been dispatched.
+    run_in_test_process([&]
+    {
+        server_config.dispatching_done.wait_for_signal_ready_for(std::chrono::seconds{5});
+    });
 }
 
 TEST_F(CustomInputDispatcherFixture, custom_input_dispatcher_gets_started_and_stopped)