Mir

Merge lp:~vanvugt/mir/fix-1583970-1584603-1584605 into lp:mir

Proposed by Daniel van Vugt on 2016-05-23
Status: Merged
Approved by: Cemil Azizoglu on 2016-05-24
Approved revision: 3519
Merged at revision: 3518
Proposed branch: lp:~vanvugt/mir/fix-1583970-1584603-1584605
Merge into: lp:mir
Diff against target: 33 lines (+16/-7)
1 file modified
tests/acceptance-tests/test_client_logging.cpp (+16/-7)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1583970-1584603-1584605
Reviewer Review Type Date Requested Status
Cemil Azizoglu (community) Approve on 2016-05-24
Andreas Pokorny (community) 2016-05-23 Approve on 2016-05-24
Mir CI Bot continuous-integration Approve on 2016-05-24
Review via email: mp+295419@code.launchpad.net

Commit message

Fix all three failures seen lately in ClientLogging.reports_performance
LP: #1583970, LP: #1584603, LP: #1584605

It will be easier to pass CI if they're all fixed simultaneously.

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

FAILED: Continuous integration, rev:3516
https://mir-jenkins.ubuntu.com/job/mir-ci/1016/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1110/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1158
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1149
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1149
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1120/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1120
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1120/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1120/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1120/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1120
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1120/artifact/output/*zip*/output.zip

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

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

Good news!

The only failure is bug 1584601 now.

3517. By Daniel van Vugt on 2016-05-23

Try again

Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:3517
https://mir-jenkins.ubuntu.com/job/mir-ci/1018/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1112/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1160
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1151
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1151
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1122/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1122
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1122/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1122/console
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1122/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1122
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1122/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Daniel van Vugt (vanvugt) wrote :
3518. By Daniel van Vugt on 2016-05-24

Try again?

3519. By Daniel van Vugt on 2016-05-24

Merge latest trunk.

This should fully unblock CI.

Mir CI Bot (mir-ci-bot) wrote :

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

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

review: Approve (continuous-integration)
Andreas Pokorny (andreas-pokorny) wrote :

ok

review: Approve
Cemil Azizoglu (cemil-azizoglu) wrote :

Nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/acceptance-tests/test_client_logging.cpp'
2--- tests/acceptance-tests/test_client_logging.cpp 2016-05-18 09:16:16 +0000
3+++ tests/acceptance-tests/test_client_logging.cpp 2016-05-24 08:19:27 +0000
4@@ -107,13 +107,22 @@
5 EXPECT_STREQ("Rumpelstiltskin", name);
6 EXPECT_THAT(render, Gt(target_render_time.count() - 1));
7
8- // Not a great test, but it will catch LP: #1581368 while
9- // also dealing with the possibility that CI machines
10- // are super slow:
11- auto expected_frame_time = 1000.0f / target_fps;
12- EXPECT_THAT(render, Lt(expected_frame_time));
13- EXPECT_THAT(lag, Gt(expected_frame_time/2));
14- EXPECT_THAT(nbuffers, Eq(3));
15+ // On a regular machine, render will be 3 (milliseconds) matching
16+ // the above render loop. CI however is super-slow at times so
17+ // we just check rendering completed in under one second.
18+ // That's still easily enough to regression-test LP: #1581368
19+ // where it had values in the millions.
20+ EXPECT_THAT(render, Lt(1000));
21+
22+ EXPECT_THAT(lag, Gt(0.0f));
23+
24+ // In order to see all three buffers the client must be rendering
25+ // at least in bursts faster than the compositor consumes them.
26+ // On the surface of it the above render loop should appear to
27+ // do that, but in reality we're feeding an unthottled fake
28+ // compositor here so may never hit all three buffers...
29+ EXPECT_THAT(nbuffers, Ge(2));
30+
31 ASSERT_FALSE(Test::HasFailure()) << "Log line = {" << line << "}";
32 }
33 }

Subscribers

People subscribed via source and target branches