Merge lp:~alan-griffiths/mir/fix-1555074 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

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

PASSED: Continuous integration, rev:3402
https://mir-jenkins.ubuntu.com/job/mir-ci/611/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/517
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/547
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/539
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/527
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/527/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/527
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/527/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/527
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/527/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/527
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/527/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/527
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/527/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Though better than before, not much of an increase. When things are slow they are an order of magnitude slow.

review: Abstain

[Alan Griffiths (alan-griffiths)]

> Though better than before, not much of an increase. When things are slow they
> are an order of magnitude slow.

We're never missing by that much. E.g. from log attached to the bug :

9: [2016-03-08 15:30:06.914238] mirserver: Logical position +640+0
...
9: [2016-03-08 15:30:08.124681] mirserver: New display configuration:

That's 1.21 seconds.

From the next instance:

12:51:13 11: [2016-03-10 12:51:12.925554] mirserver: Logical position +640+0
...
12:51:15 11: [2016-03-10 12:51:14.394200] mirserver: New display configuration:

That's 1.47 seconds

And the next:

16:30:38 11: [2016-03-14 16:30:37.818265] mirserver: Logical position +640+0
...
16:30:41 11: [2016-03-14 16:30:39.041641] mirserver: New display configuration:

And these are the rare bad cases where we see a failure. 3 seconds is a binary order of magnitude slower.

IMO taking this long to recognize an orientation change is amazingly slow!

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

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

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

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

Failure is lp:1394369

[Daniel van Vugt (vanvugt)]

Hmm, that's yet another performance test failing (only) in CI, presumably because the CI environment is unrealistically slow. :/

[Daniel van Vugt (vanvugt)]

But aside from that, approved (fingers crossed for both the bug fix and for CI).

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-03-14 10:13:49 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp	2016-03-17 13:39:31 +0000
@@ -710,7 +710,7 @@
 
         mir_wait_for(mir_connection_apply_display_config(client.connection, configuration));
 
-        condition.wait_for_at_most_seconds(1);
+        condition.wait_for_at_most_seconds(3);
         Mock::VerifyAndClearExpectations(the_mock_display_configuration_report().get());
     }