Mir

Merge lp:~vanvugt/mir/fix-1563148 into lp:mir

Proposed by Daniel van Vugt on 2016-03-29
Status: Merged
Approved by: Alan Griffiths on 2016-03-29
Approved revision: 3426
Merged at revision: 3427
Proposed branch: lp:~vanvugt/mir/fix-1563148
Merge into: lp:mir
Diff against target: 10 lines (+0/-1)
1 file modified
tests/acceptance-tests/test_client_logging.cpp (+0/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/fix-1563148
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2016-03-29
Alan Griffiths Approve on 2016-03-29
Kevin DuBois (community) 2016-03-29 Approve on 2016-03-29
Review via email: mp+290282@code.launchpad.net

Commit message

acceptance-tests: ClientLogging.reports_performance:
Remove performance-sensitive expectation. It's not the right place to be
testing actual performance and some people say it still occasionally
fails for them. Removing this expectation also makes the test name much
more accurate. (LP: #1563148)

The correctness of the performance report is still verified elsewhere in:
unit-tests: PeriodicPerfReport.reports_the_right_numbers_*

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

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

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

review: Approve (continuous-integration)
Kevin DuBois (kdub) wrote :

lgtm

review: Approve
Alan Griffiths (alan-griffiths) wrote :

OK

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

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

review: Needs Fixing (continuous-integration)
Alberto Aguirre (albaguirre) wrote :

^---Failure looks like lp:1560900

Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

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-03-07 11:48:42 +0000
3+++ tests/acceptance-tests/test_client_logging.cpp 2016-03-29 08:30:10 +0000
4@@ -92,7 +92,6 @@
5 " perf: %255[^:]: %f FPS,", name, &fps);
6 ASSERT_EQ(2, fields) << "Log line = {" << line << "}";
7 EXPECT_STREQ("Rumpelstiltskin", name);
8- EXPECT_NEAR(target_fps, fps, 5.0f);
9 }
10 }
11

Subscribers

People subscribed via source and target branches