Mir

Merge lp:~brandontschaefer/mir/fix-remove-display-test into lp:mir

Proposed by Brandon Schaefer on 2017-01-03
Status: Merged
Approved by: Daniel van Vugt on 2017-01-04
Approved revision: 3901
Merged at revision: 3901
Proposed branch: lp:~brandontschaefer/mir/fix-remove-display-test
Merge into: lp:mir
Diff against target: 18 lines (+2/-2)
1 file modified
tests/acceptance-tests/test_new_display_configuration.cpp (+2/-2)
To merge this branch: bzr merge lp:~brandontschaefer/mir/fix-remove-display-test
Reviewer Review Type Date Requested Status
Daniel van Vugt 2017-01-03 Approve on 2017-01-04
Mir CI Bot continuous-integration Approve on 2017-01-04
Review via email: mp+314041@code.launchpad.net

Commit message

Be sure to call the expect call before the real call.
(LP: #1653789)

Description of the change

Be sure to call the expect call before the real call.

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3901
https://mir-jenkins.ubuntu.com/job/mir-ci/2510/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/3269/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3336
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3328
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3328
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3328
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3298/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3298
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3298/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3298
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3298/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3298
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3298/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3298
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3298/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3298
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3298/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2510/rebuild

review: Needs Fixing (continuous-integration)
Mir CI Bot (mir-ci-bot) wrote :

PASSED: Continuous integration, rev:3901
https://mir-jenkins.ubuntu.com/job/mir-ci/2511/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3270
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3337
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3329
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3329
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/3329
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3299
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/3299/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3299
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3299/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3299
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/3299/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3299
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3299/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3299
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3299/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3299
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3299/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/2511/rebuild

review: Approve (continuous-integration)
Daniel van Vugt (vanvugt) wrote :

Sure. Land it and see if the problem ever reoccurs...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/acceptance-tests/test_new_display_configuration.cpp'
--- tests/acceptance-tests/test_new_display_configuration.cpp 2016-12-16 16:18:54 +0000
+++ tests/acceptance-tests/test_new_display_configuration.cpp 2017-01-03 22:30:42 +0000
@@ -1804,12 +1804,12 @@
1804 observed_changed.wait_for(10s);1804 observed_changed.wait_for(10s);
1805 observed_changed.reset();1805 observed_changed.reset();
18061806
1807 mir_connection_remove_session_display_configuration(connection);
1808
1809 EXPECT_CALL(*observer, session_configuration_removed(_))1807 EXPECT_CALL(*observer, session_configuration_removed(_))
1810 .Times(1)1808 .Times(1)
1811 .WillOnce(mt::WakeUp(&observed_changed));1809 .WillOnce(mt::WakeUp(&observed_changed));
18121810
1811 mir_connection_remove_session_display_configuration(connection);
1812
1813 observed_changed.wait_for(10s);1813 observed_changed.wait_for(10s);
18141814
1815 mir_display_config_release(configuration);1815 mir_display_config_release(configuration);

Subscribers

People subscribed via source and target branches