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

[Alan Griffiths]

tests: avoid a race between SurfaceObservingServerConfiguration::on_start() setting expectations and the client calls that satisfy the expectation.

tests: avoid a race between SurfaceObservingServerConfiguration::on_start() setting expectations and the client calls that satisfy the expectation.

[lp:~alan-griffiths/mir/fix-1332011]

1716. By Alan Griffiths on 2014-06-23

Remove unnecessary state

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1715
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/483
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/480
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/480/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1928
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1928/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1837
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8733

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1716
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1964/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/654
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/660
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/654/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/485
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/485/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/482
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/482/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1937
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1937/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1840/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8744

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

review: Needs Fixing (continuous-integration)

[Kevin DuBois (kdub)]

W: Failed to fetch bzip2:/var/lib/apt/lists/partial/ports.ubuntu.com_ubuntu-ports_dists_utopic_main_binary-armhf_Packages Hash Sum mismatch

retriggering

[Kevin DuBois (kdub)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1716
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/1976/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/668/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/674/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/668/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/497/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/494/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1962/console

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

review: Needs Fixing (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Merge conflicts.

[Alexandros Frantzis (afrantzis)]

Looks good (besides conflicts).

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

LGTM.

review: Approve

[Alan Griffiths (alan-griffiths)]

This race was fixed in lp:~mir-team/mir/cursor-spike-phase-4-implement-api which landed in -r1717

Unmerged revisions

1716. By Alan Griffiths on 2014-06-23

Remove unnecessary state

1715. By Alan Griffiths on 2014-06-23

Avoid race between client connection and on_start()

=== modified file 'tests/acceptance-tests/test_client_cursor_api.cpp'
--- tests/acceptance-tests/test_client_cursor_api.cpp	2014-06-19 00:02:28 +0000
+++ tests/acceptance-tests/test_client_cursor_api.cpp	2014-06-23 13:34:34 +0000
@@ -175,21 +175,26 @@
 struct SurfaceObservingServerConfiguration : mtf::TestingServerConfiguration
 {
     SurfaceObservingServerConfiguration(std::function<void(MockSurfaceObserver&)> const& set_expectations)
-        : set_expectations(set_expectations),
-          observer(std::make_shared<MockSurfaceObserver>())
+        : set_expectations(set_expectations)
     {
     }
 
-    void on_start() override
+    std::shared_ptr<mir::compositor::Scene> the_scene() override
     {
-        auto scene = the_scene();
-        scene->add_observer(std::make_shared<SurfaceObserverInstaller>(observer));
-        
-        set_expectations(*observer);
+        return scene_cache([this]
+        {
+            auto const scene = mtf::TestingServerConfiguration::the_scene();
+            auto const observer = std::make_shared<MockSurfaceObserver>();
+
+            set_expectations(*observer);
+            scene->add_observer(std::make_shared<SurfaceObserverInstaller>(observer));
+
+            return scene;
+        });
     }
 
     std::function<void(MockSurfaceObserver&)> const set_expectations;
-    std::shared_ptr<MockSurfaceObserver> const observer;
+    mir::CachedPtr<mir::compositor::Scene> scene_cache;
 };
 
 typedef unsigned ClientCount;