Mir

Merge lp:~alan-griffiths/mir/fix-1552065 into lp:mir

  1. fix-1552065
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 3389
Proposed branch: lp:~alan-griffiths/mir/fix-1552065
Merge into: lp:mir
Diff against target: 33 lines (+5/-2)
1 file modified
tests/acceptance-tests/test_new_display_configuration.cpp (+5/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1552065
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve
Mir CI Bot continuous-integration Approve
Review via email: mp+288751@code.launchpad.net

Commit message

test: Resolve race in DisplayConfigurationTest.output_position_is_independent_of_orientation (Fixes LP:1552065)

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

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Failure...

11:08:37 11: [ RUN ] MirSurfaceVisibilityEvent.exposed_received_when_surface_raised_over_occluding_surface
11:08:37 11: [2016-03-11 11:08:37.041108] mirserver: Starting
11:08:37 11: [2016-03-11 11:08:37.043789] mirserver: Selected driver: dummy (version 0.20.0)
11:08:37 11: [2016-03-11 11:08:37.067340] mirserver: Initial display configuration:
11:08:37 11: [2016-03-11 11:08:37.067738] mirserver: 1.1: VGA 0.0" 0x0mm
11:08:37 11: [2016-03-11 11:08:37.067972] mirserver: Current mode 1600x1600 60.00Hz
11:08:37 11: [2016-03-11 11:08:37.068220] mirserver: Preferred mode 1600x1600 60.00Hz
11:08:37 11: [2016-03-11 11:08:37.068423] mirserver: Logical position +0+0
11:08:37 11: [2016-03-11 11:08:37.070976] mirserver: Using software cursor
11:08:37 11: [2016-03-11 11:08:37.088056] mirserver: Selected input driver: mir:stub-input (version: 0.20.0)
11:08:37 11: [2016-03-11 11:08:37.089304] mirserver: Mir version 0.20.0
11:08:37 11: /��BUILDDIR��/mir-0.20.1+16.04.20160225.1+vivid444bzr3385/tests/acceptance-tests/test_client_surface_visibility.cpp:179: Failure
11:08:37 11: Mock function called more times than expected - returning directly.
11:08:37 11: Function call: handle(0x1222c330, 0)
11:08:37 11: Expected: to be called once
11:08:37 11: Actual: called twice - over-saturated and active
11:08:38 11: [2016-03-11 11:08:38.077075] mirserver: Stopping
11:08:38 11: [ FAILED ] MirSurfaceVisibilityEvent.exposed_received_when_surface_raised_over_occluding_surface (1072 ms)

...logged as lp:1556045

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Infrastructure glitch?

15:39:29 E: Unable to locate package glmark2-data
15:39:29 E: Unable to locate package glmark2-es2-mir
15:39:29 E: Unable to locate package umockdev

Revision history for this message
Mir CI Bot (mir-ci-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm

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_new_display_configuration.cpp'
2--- tests/acceptance-tests/test_new_display_configuration.cpp 2016-03-02 00:41:29 +0000
3+++ tests/acceptance-tests/test_new_display_configuration.cpp 2016-03-14 10:15:56 +0000
4@@ -571,7 +571,6 @@
5 output.top_left = *position;
6 ++position;
7 });
8- server.the_display_configuration_controller()->set_base_configuration(server_config);
9
10 DisplayClient client{new_connection()};
11
12@@ -588,6 +587,9 @@
13 &new_display_config_matches,
14 &context);
15
16+ server.the_display_configuration_controller()->set_base_configuration(server_config);
17+ context.done.wait_for(std::chrono::seconds{10});
18+
19 for (auto const orientation :
20 {mir_orientation_normal, mir_orientation_left, mir_orientation_inverted, mir_orientation_right})
21 {
22@@ -597,10 +599,11 @@
23 {
24 output.orientation = orientation;
25 });
26+
27+ context.done.reset();
28 server.the_display_configuration_controller()->set_base_configuration(server_config);
29
30 EXPECT_TRUE(context.done.wait_for(std::chrono::seconds{10}));
31- context.done.reset();
32
33 auto config = client.get_base_config();
34

Subscribers

People subscribed via source and target branches