Merge lp:~alan-griffiths/mir/workaround-1523621 into lp:mir

[Alan Griffiths]

tests: Workaround racy test setup in NestedServer.*_cursor*

tests: Workaround racy test setup in NestedServer.*_cursor*

I'd love to find a better solution, but this workaround is the best I have today.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3194
http://jenkins.qa.ubuntu.com/job/mir-ci/5846/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4214
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5257
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/156/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/174
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/174
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/174/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5257
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5257/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7777
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26041
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/154
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/154/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/13/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26044

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

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

I think our test/build machines are often too slow (or running valgrind) for 10ms to make a reliable difference. So it should possibly be higher. But it's a start...

review: Approve

[Daniel van Vugt (vanvugt)]

Hmm, the bug(s) in question are slowing down other MPs still. I might just land this and see what happens.

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2015-12-11 03:18:13 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2015-12-14 17:46:15 +0000
@@ -630,11 +630,12 @@
     ClientWithAPaintedSurfaceAndABufferStream client(nested_mir);
     auto const mock_cursor = the_mock_cursor();
 
-    client.update_surface_spec(
-        [](MirSurfaceSpec* spec) { mir_surface_spec_set_fullscreen_on_output(spec, 1); });
-
     server.the_cursor_listener()->cursor_moved_to(489, 9);
 
+    // TODO workaround for lp:1523621
+    // (I don't see a way to detect that the host has placed focus on "Mir nested display for output #1")
+    std::this_thread::sleep_for(10ms);
+
     {
         mt::WaitCondition condition;
         EXPECT_CALL(*mock_cursor, show(_)).Times(1)
@@ -668,11 +669,12 @@
     ClientWithAPaintedSurface client(nested_mir);
     auto const mock_cursor = the_mock_cursor();
 
-    client.update_surface_spec(
-        [](MirSurfaceSpec* spec) { mir_surface_spec_set_fullscreen_on_output(spec, 1); });
-
     server.the_cursor_listener()->cursor_moved_to(489, 9);
 
+    // TODO workaround for lp:1523621
+    // (I don't see a way to detect that the host has placed focus on "Mir nested display for output #1")
+    std::this_thread::sleep_for(10ms);
+
     for (auto const name : cursor_names)
     {
         mt::WaitCondition condition;
@@ -697,11 +699,12 @@
     ClientWithAPaintedSurfaceAndABufferStream client(nested_mir);
     auto const mock_cursor = the_mock_cursor();
 
-    client.update_surface_spec(
-        [](MirSurfaceSpec* spec) { mir_surface_spec_set_fullscreen_on_output(spec, 1); });
-
     server.the_cursor_listener()->cursor_moved_to(489, 9);
 
+    // TODO workaround for lp:1523621
+    // (I don't see a way to detect that the host has placed focus on "Mir nested display for output #1")
+    std::this_thread::sleep_for(10ms);
+
     {
         mt::WaitCondition condition;
         EXPECT_CALL(*mock_cursor, show(_)).Times(1)