Mir

Merge lp:~andreas-pokorny/mir/fix-1646558 into lp:mir

  1. fix-1646558
  2. Merge into development-branch
Proposed by Andreas Pokorny
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 3930
Proposed branch: lp:~andreas-pokorny/mir/fix-1646558
Merge into: lp:mir
Diff against target: 41 lines (+7/-7)
1 file modified
tests/acceptance-tests/test_nested_input.cpp (+7/-7)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/fix-1646558
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Daniel van Vugt Approve
Mir CI Bot continuous-integration Needs Fixing
Review via email: mp+314503@code.launchpad.net

Commit message

Wait longer for nested server being started up

According to logs the display output reports happen after two seconds. After that a client still has to connect and swap buffers to make the nested server appear on host. Then we still have to wait for the focus change to happen in host.

Description of the change

I am not sure yet if this is really just a slow ci issue.

This adds asserts to see if they waits for nested server startup time out or not..

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

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

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

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

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

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

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

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

If the problem really is just a slow system then I don't think bumping 2s to 5s is enough. We probably want a lot more. If the test is functioning correctly then it costs us nothing to have a high timeout that is never reached.

review: Needs Fixing
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I would suggest 60s...

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

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

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

^^^ Bug 1523621

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Thanks. I would definitely expect 2s timeouts to be exceeded on a regular basis on our loaded CI systems.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Not sure it helps, but can't hurt.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/acceptance-tests/test_nested_input.cpp'
--- tests/acceptance-tests/test_nested_input.cpp 2017-01-11 20:17:22 +0000
+++ tests/acceptance-tests/test_nested_input.cpp 2017-01-12 07:50:45 +0000
@@ -328,12 +328,12 @@
328328
329 NestedServerWithMockEventFilter nested_mir{new_connection(), mt::fake_shared(nested_event_filter)};329 NestedServerWithMockEventFilter nested_mir{new_connection(), mt::fake_shared(nested_event_filter)};
330 ExposedSurface client_to_nested_mir(nested_mir.new_connection());330 ExposedSurface client_to_nested_mir(nested_mir.new_connection());
331 client_to_nested_mir.ready_to_accept_events.wait_for(1s);331 ASSERT_TRUE(client_to_nested_mir.ready_to_accept_events.wait_for(60s));
332332
333 devices_ready.wait_for(2s);333 ASSERT_TRUE(devices_ready.wait_for(60s));
334334
335 fake_mouse->emit_event(mis::a_pointer_event().with_movement(initial_movement_x, initial_movement_y));335 fake_mouse->emit_event(mis::a_pointer_event().with_movement(initial_movement_x, initial_movement_y));
336 event_received.wait_for(2s);336 ASSERT_TRUE(event_received.wait_for(60s));
337337
338 event_received.reset();338 event_received.reset();
339339
@@ -343,7 +343,7 @@
343 .WillOnce(DoAll(mt::WakeUp(&event_received), Return(true)));343 .WillOnce(DoAll(mt::WakeUp(&event_received), Return(true)));
344344
345 fake_mouse->emit_event(mis::a_pointer_event().with_movement(second_movement_x, second_movement_y));345 fake_mouse->emit_event(mis::a_pointer_event().with_movement(second_movement_x, second_movement_y));
346 event_received.wait_for(2s);346 ASSERT_TRUE(event_received.wait_for(60s));
347}347}
348348
349TEST_F(NestedInputWithMouse, mouse_pointer_position_is_in_sync_with_host_server)349TEST_F(NestedInputWithMouse, mouse_pointer_position_is_in_sync_with_host_server)
@@ -370,9 +370,9 @@
370370
371 NestedServerWithMockEventFilter nested_mir{new_connection(), mt::fake_shared(nested_event_filter)};371 NestedServerWithMockEventFilter nested_mir{new_connection(), mt::fake_shared(nested_event_filter)};
372 ExposedSurface client_to_nested_mir(nested_mir.new_connection());372 ExposedSurface client_to_nested_mir(nested_mir.new_connection());
373 client_to_nested_mir.ready_to_accept_events.wait_for(1s);373 ASSERT_TRUE(client_to_nested_mir.ready_to_accept_events.wait_for(60s));
374 devices_ready.wait_for(2s);374 ASSERT_TRUE(devices_ready.wait_for(60s));
375375
376 fake_mouse->emit_event(mis::a_pointer_event().with_movement(x[2], y[2]));376 fake_mouse->emit_event(mis::a_pointer_event().with_movement(x[2], y[2]));
377 event_received.wait_for(2s);377 ASSERT_TRUE(event_received.wait_for(60s));
378}378}

Subscribers

People subscribed via source and target branches