Merge lp:~alan-griffiths/mir/fix-1522356 into lp:mir

[Alan Griffiths]

tests: don't set expectations on "surface_event" while it may be called on another thread

tests: don't set expectations on "surface_event" while it may be called on another thread

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Kevin DuBois (kdub)]

ok

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3167
http://jenkins.qa.ubuntu.com/job/mir-ci/5763/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5181
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4087/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/92/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5129
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7659
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25774

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

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

Failure is lp:1522105

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3168
http://jenkins.qa.ubuntu.com/job/mir-ci/5764/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4089
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5131
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/91/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5131
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7661
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25780
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/89/console

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

review: Approve (continuous-integration)

=== modified file 'tests/acceptance-tests/test_system_compositor_window_manager.cpp'
--- tests/acceptance-tests/test_system_compositor_window_manager.cpp	2015-11-10 09:03:33 +0000
+++ tests/acceptance-tests/test_system_compositor_window_manager.cpp	2015-12-03 11:58:33 +0000
@@ -177,13 +177,12 @@
     // Throw away all uninteresting surface events
     EXPECT_CALL(client, surface_event(_, Not(MirFocusEvent(mir_surface_focused)))).Times(AnyNumber());
 
-    auto surface = client.create_surface(1);
-
     mt::Signal signal;
 
     EXPECT_CALL(client, surface_event(_, MirFocusEvent(mir_surface_focused))).Times(1)
             .WillOnce(InvokeWithoutArgs([&] { signal.raise(); }));
 
+    auto surface = client.create_surface(1);
     surface.post_buffer();
 
     signal.wait_for(1s);
@@ -192,12 +191,16 @@
 TEST_F(SystemCompositorWindowManager, if_no_surface_posts_client_never_gets_focus)
 {
     auto client = connect_client();
-    auto surface = client.create_surface(1);
+
+    // Throw away all uninteresting surface events
+    EXPECT_CALL(client, surface_event(_, Not(MirFocusEvent(mir_surface_focused)))).Times(AnyNumber());
 
     mt::Signal signal;
 
     ON_CALL(client, surface_event(_, MirFocusEvent(mir_surface_focused)))
             .WillByDefault(InvokeWithoutArgs([&] { signal.raise(); }));
 
+    auto surface = client.create_surface(1);
+
     EXPECT_FALSE(signal.wait_for(100ms)) << "Unexpected surface_focused event received";
 }