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

[Kevin DuBois]

fix lp: #1603145 by ensuring client code runs in its own process as well, to work around android drivers that have load/unload problems.

fixes: LP: #1603145

fix lp: #1603145 by ensuring client code runs in its own process as well, to work around android drivers that have load/unload problems.

fixes: LP: #1603145

This seems to have been caused by a hybris update... maybe this is a result of hybris. Worth looking into upstream, but for now, this seems the best way to work around.

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

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

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

review: Approve (continuous-integration)

Unmerged revisions

3593. By Kevin DuBois on 2016-07-14

re-enable test

3592. By Kevin DuBois on 2016-07-14

merge base

3591. By Kevin DuBois on 2016-07-14

fork off the client process in the privileged tests as well

=== modified file 'tests/privileged-tests/test_input_events.cpp'
--- tests/privileged-tests/test_input_events.cpp	2016-07-14 19:23:24 +0000
+++ tests/privileged-tests/test_input_events.cpp	2016-07-14 19:23:24 +0000
@@ -225,6 +225,8 @@
     static int const key_down = 1;
     static int const key_up = 0;
 
+    std::chrono::milliseconds const pause_time { 100 }; 
+
     std::shared_ptr<mtf::Process> host_server;
     std::shared_ptr<mtf::Process> nested_server;
     FakeInputDevice fake_keyboard;
@@ -236,55 +238,67 @@
 {
     using namespace testing;
 
-    MockInputHandler handler;
-
-    MirConnectionUPtr host_connection{
-        mir_connect_sync(host_socket.c_str(), "test"),
-        mir_connection_release};
-    auto surface = create_surface_with_input_handler(host_connection.get(), &handler);
-
-    mt::Signal all_events_received;
-    InSequence seq;
-    EXPECT_CALL(handler,
-                handle_input(AllOf(mt::KeyDownEvent(), mt::KeyOfSymbol(XKB_KEY_a))));
-    EXPECT_CALL(handler,
-                handle_input(AllOf(mt::KeyUpEvent(), mt::KeyOfSymbol(XKB_KEY_a))))
-        .WillOnce(mt::WakeUp(&all_events_received));
-
+    auto client = mtf::fork_and_run_in_a_different_process(
+    [this]
+    {
+        MockInputHandler handler;
+
+        MirConnectionUPtr host_connection{
+            mir_connect_sync(host_socket.c_str(), "test"),
+            mir_connection_release};
+        auto surface = create_surface_with_input_handler(host_connection.get(), &handler);
+
+        mt::Signal all_events_received;
+        InSequence seq;
+        EXPECT_CALL(handler,
+                    handle_input(AllOf(mt::KeyDownEvent(), mt::KeyOfSymbol(XKB_KEY_a))));
+        EXPECT_CALL(handler,
+                    handle_input(AllOf(mt::KeyUpEvent(), mt::KeyOfSymbol(XKB_KEY_a))))
+            .WillOnce(mt::WakeUp(&all_events_received));
+        all_events_received.wait_for(std::chrono::seconds{5});
+    },
+    [] { return EXIT_SUCCESS; });
+
+    std::this_thread::sleep_for(pause_time);
     fake_keyboard.emit_event(EV_KEY, KEY_A, key_down);
     fake_keyboard.emit_event(EV_KEY, KEY_A, key_up);
     fake_keyboard.syn();
-
-    all_events_received.wait_for(std::chrono::seconds{5});
+    EXPECT_TRUE(client->wait_for_termination().succeeded());
 }
 
-TEST_F(InputEvents, DISABLED_reach_nested_client)
+TEST_F(InputEvents, reach_nested_client)
 {
     using namespace testing;
-
-    MockInputHandler handler;
-
-    MirConnectionUPtr nested_connection{
-        mir_connect_sync(nested_socket.c_str(), "test"),
-        mir_connection_release};
-    auto surface = create_surface_with_input_handler(nested_connection.get(), &handler);
-
     // Give some time to the nested server to swap its framebuffer, so the nested
     // server window becomes visible and focused and can accept input events.
     // TODO: Find a more reliable way to wait for the nested server to gain focus
-    std::this_thread::sleep_for(100ms);
-
-    mt::Signal all_events_received;
-    InSequence seq;
-    EXPECT_CALL(handler,
-                handle_input(AllOf(mt::KeyDownEvent(), mt::KeyOfSymbol(XKB_KEY_a))));
-    EXPECT_CALL(handler,
-                handle_input(AllOf(mt::KeyUpEvent(), mt::KeyOfSymbol(XKB_KEY_a))))
-        .WillOnce(mt::WakeUp(&all_events_received));
-
+    std::this_thread::sleep_for(pause_time);
+
+    auto client = mtf::fork_and_run_in_a_different_process(
+    [this]
+    {
+        MockInputHandler handler;
+
+        MirConnectionUPtr nested_connection{
+            mir_connect_sync(nested_socket.c_str(), "test"),
+            mir_connection_release};
+        auto surface = create_surface_with_input_handler(nested_connection.get(), &handler);
+
+        mt::Signal all_events_received;
+        InSequence seq;
+        EXPECT_CALL(handler,
+                    handle_input(AllOf(mt::KeyDownEvent(), mt::KeyOfSymbol(XKB_KEY_a))));
+        EXPECT_CALL(handler,
+                    handle_input(AllOf(mt::KeyUpEvent(), mt::KeyOfSymbol(XKB_KEY_a))))
+            .WillOnce(mt::WakeUp(&all_events_received));
+
+        all_events_received.wait_for(std::chrono::seconds{5});
+    },
+    [] { return EXIT_SUCCESS; });
+
+    std::this_thread::sleep_for(pause_time);
     fake_keyboard.emit_event(EV_KEY, KEY_A, key_down);
     fake_keyboard.emit_event(EV_KEY, KEY_A, key_up);
     fake_keyboard.syn();
-
-    all_events_received.wait_for(std::chrono::seconds{5});
+    EXPECT_TRUE(client->wait_for_termination().succeeded());
 }