Merge lp:~albaguirre/mir/fix-test-client-input-failures into lp:mir

[Alberto Aguirre]

tests: TestClientInput: fix race between sending a fake event and surface becoming ready to receive events

tests: TestClientInput: fix race between sending a fake event and surface becoming ready to receive events

[Andreas Pokorny (andreas-pokorny)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3185
http://jenkins.qa.ubuntu.com/job/mir-ci/5800/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5191
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/127/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5191
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7720
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25905
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/125/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5800/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5249
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4155/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/83
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/83
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5198
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5198/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7723
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25915

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

"6: [ RUN ] ClientLatency.throttled_input_rate_yields_lower_latency
6: [1449705449.168071] mirserver: Starting
6: [1449705449.168149] mirserver: Selected driver: dummy (version 0.19.0)
6: [1449705449.170028] mirserver: Initial display configuration:
6: [1449705449.170953] mirserver: Using software cursor
6: [1449705449.171309] mirserver: Selected input driver: stub-input (version: 0.19.0)
6: [1449705449.171343] mirserver: Mir version 0.19.0
6: /mir/tests/acceptance-tests/test_latency.cpp:259: Failure
6: Value of: observed_latency
6: Expected: is < 1.1
6: Actual: 1.15 (of type float)
6: [1449705451.380062] mirserver: Stopping
6: [ FAILED ] ClientLatency.throttled_input_rate_yields_lower_latency (2230 ms)
"

Failure is lp:1509291

[Daniel van Vugt (vanvugt)]

It's sounding good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5250
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4156/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5199
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/84
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-autolanding/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/84
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-autolanding/84/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5199
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5199/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7724
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25916

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

"6: /mir/tests/acceptance-tests/test_nested_mir.cpp:549: Failure
6: Actual function call count doesn't match EXPECT_CALL(*mock_cursor, show(_))...
6: Expected: to be called once
6: Actual: never called - unsatisfied and active
6: [1449708539.438760] mirserver: Stopping
6: [1449708539.463858] mirserver: Stopping
6: [ FAILED ] NestedServer.animated_cursor_image_changes_are_forwarded_to_host (1116 ms)"

That's lp:1523621, unrelated to this branch.

I'm winning the CI fail lottery today... Let's try again.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/acceptance-tests/test_client_input.cpp'
--- tests/acceptance-tests/test_client_input.cpp	2015-11-05 11:51:04 +0000
+++ tests/acceptance-tests/test_client_input.cpp	2015-12-09 17:59:04 +0000
@@ -105,6 +105,23 @@
             BOOST_THROW_EXCEPTION(std::runtime_error("Timeout waiting for surface to become focused and exposed"));
     }
 
+    void handle_surface_event(MirSurfaceEvent const* event)
+    {
+        auto const attrib = mir_surface_event_get_attribute(event);
+        auto const value = mir_surface_event_get_attribute_value(event);
+
+        if (mir_surface_attrib_visibility == attrib &&
+            mir_surface_visibility_exposed == value)
+            exposed = true;
+
+        if (mir_surface_attrib_focus == attrib &&
+            mir_surface_focused == value)
+            focused = true;
+
+        if (exposed && focused)
+            ready_to_accept_events.wake_up_everyone();
+    }
+
     static void handle_event(MirSurface*, MirEvent const* ev, void* context)
     {
         auto const client = static_cast<Client*>(context);
@@ -112,10 +129,8 @@
         if (type == mir_event_type_surface)
         {
             auto surface_event = mir_event_get_surface_event(ev);
+            client->handle_surface_event(surface_event);
 
-            if (mir_surface_attrib_focus == mir_surface_event_get_attribute(surface_event) &&
-                1 == mir_surface_event_get_attribute_value(surface_event))
-                client->ready_to_accept_events.wake_up_everyone();
         }
         if (type == mir_event_type_input)
             client->handle_input(ev);
@@ -134,6 +149,8 @@
     MirConnection * connection;
     mir::test::WaitCondition ready_to_accept_events;
     mir::test::WaitCondition all_events_received;
+    bool exposed = false;
+    bool focused = false;
 };
 
 struct TestClientInput : mtf::HeadlessInProcessServer