Merge lp:~vanvugt/mir/test-1270964 into lp:mir

[Daniel van Vugt]

Add a regression test for LP: #1270964 (disabled till it's fixed)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1341
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/692/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-trusty-i386-build/681
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-trusty-amd64-build/677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-trusty-touch/283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/422
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-amd64-ci/422/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/426
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-trusty-armhf-ci/426/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/283
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-trusty-armhf/283/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/298
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3215

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I'm not a fan of tests that fail by hanging. Especially on CI infrastructure.

review: Needs Fixing

Unmerged revisions

1341. By Daniel van Vugt on 2014-01-21

Add a regression test for LP: #1270964 (disabled till it's fixed)

=== modified file 'tests/unit-tests/compositor/test_switching_bundle.cpp'
--- tests/unit-tests/compositor/test_switching_bundle.cpp	2014-01-13 06:12:33 +0000
+++ tests/unit-tests/compositor/test_switching_bundle.cpp	2014-01-21 07:53:39 +0000
@@ -869,3 +869,18 @@
     }
 }
 
+TEST_F(SwitchingBundleTest, DISABLED_compositor_client_interleaved)
+{   // Regression test for LP: #1270964
+    int const nbuffers = 3;
+    mc::SwitchingBundle bundle(nbuffers, allocator, basic_properties);
+    mg::Buffer* client_buffer = nullptr;
+
+    client_buffer = bundle.client_acquire();
+    bundle.client_release(client_buffer);
+
+    client_buffer = bundle.client_acquire();
+    bundle.compositor_acquire(0);
+    bundle.client_release(client_buffer);
+
+    client_buffer = bundle.client_acquire(); // <- locks here if in buggy state
+}