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

[Alan Griffiths]

tests: Don't keep surfaces alive and try to destroy them after the server has been torn down

tests: Don't keep surfaces alive and try to destroy them after the server has been torn down

Alternative solution to https://code.launchpad.net/~afrantzis/mir/fix-1335819-surface-destruction-after-teardown/+merge/224981

[Cemil Azizoglu (cemil-azizoglu)]

LGTM.

review: Approve

[Andreas Pokorny (andreas-pokorny)]

Voting for this one, looks a more natural or symmetric fix: the shared_ptr to scene_surface is acquired in Setup - and now released in TearDown.

review: Approve

[Alberto Aguirre (albaguirre)]

Yep, simpler is better.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1733
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2030/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/763
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/551
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/549
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/549/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2284
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2284/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1918
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9027

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2030/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-team-mir-development-branch-autolanding/824/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/770
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/776/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/769
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/208
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/208/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/208
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/208/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2318
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2318/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1928
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9057

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

> Start 53: mir_integration_tests.SurfaceStackCompositor.*
> Build timed out (after 120 minutes). Marking the build as failed.

I don't recall other timeouts in mir_integration_tests.SurfaceStackCompositor - so assuming this is down to load on build hardware.

Re-approving

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-autolanding/829/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/778
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-autolanding/213/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/213
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-autolanding/213/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2353
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2353/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/1935
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9091

review: Needs Fixing (continuous-integration)

=== modified file 'tests/acceptance-tests/test_client_surface_events.cpp'
--- tests/acceptance-tests/test_client_surface_events.cpp	2014-06-19 16:15:42 +0000
+++ tests/acceptance-tests/test_client_surface_events.cpp	2014-06-30 11:41:25 +0000
@@ -148,6 +148,7 @@
     void TearDown() override
     {
         mir_surface_release_sync(other_surface);
+        scene_surface.reset();
         mir_surface_release_sync(surface);
 
         BasicClientServerFixture::TearDown();