Merge lp:~alan-griffiths/mir/fix-1555074-again into lp:mir

[Alan Griffiths]

tests: increase timeout in NestedServer.display_orientation_changes_are_forwarded_to_host
(LP: #1555074)

tests: increase timeout in NestedServer.display_orientation_changes_are_forwarded_to_host

This is the same fix that landed in -r 3402

C.f. lp:~alan-griffiths/mir/fix-1555074/+merge/289366

[Alan Griffiths (alan-griffiths)]

FWIW:

$ bzr diff -c 3444 | grep --context 2 "config_reported.wait_for(std::chrono::seconds{1});"

- condition.wait_for_at_most_seconds(3);
+ config_reported.wait_for(std::chrono::seconds{1});
         Mock::VerifyAndClearExpectations(the_mock_display_configuration_report().get());

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3458
https://mir-jenkins.ubuntu.com/job/mir-ci/834/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/841/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/878
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/869
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/869
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/851
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/851/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/851
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/851/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/851
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/851/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/851
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/851/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/851/console

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Unrelated failure logged as lp:1570353

[Kevin DuBois (kdub)]

alright

review: Approve

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/200/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/846/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/212/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/883
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/874
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/874
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/856
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/856/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/856
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/856/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/856
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/856/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/856
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/856/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/856/console

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

ok

review: Approve

[Mir CI Bot (mir-ci-bot)]

review: Approve (continuous-integration)

=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp	2016-04-11 16:56:16 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2016-04-14 10:45:33 +0000
@@ -712,7 +712,7 @@
 
         mir_wait_for(mir_connection_apply_display_config(client.connection, configuration));
 
-        config_reported.wait_for(std::chrono::seconds{1});
+        config_reported.wait_for(std::chrono::seconds{3});
         Mock::VerifyAndClearExpectations(the_mock_display_configuration_report().get());
     }