Mir

Merge lp:~afrantzis/mir/fix-1517990 into lp:mir

  1. fix-1517990
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Merged at revision: 3114
Proposed branch: lp:~afrantzis/mir/fix-1517990
Merge into: lp:mir
Diff against target: 19 lines (+1/-1)
1 file modified
tests/acceptance-tests/test_nested_mir.cpp (+1/-1)
To merge this branch: bzr merge lp:~afrantzis/mir/fix-1517990
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Alan Griffiths Approve
Review via email: mp+278128@code.launchpad.net

Commit message

tests: Ensure trigger for expectation happens after we have set that expectation

We recently changed the focusing logic in our window managers, so that a
session without a surface cannot have the focus. Therefore a session loses the
focus (and any per-session display config is unapplied) when its last
surface is released, not when the session disconnects.

Description of the change

tests: Ensure trigger for expectation happens after we have set that expectation

We recently changed the focusing logic in our window managers, so that a
session without a surface cannot have the focus. Therefore, a session loses the
focus (and any per-session display config is unapplied) when its last
surface is released, not when the session disconnects.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3112
http://jenkins.qa.ubuntu.com/job/mir-ci/5605/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4896
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/852/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1758
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1758/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/850
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/850/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4896
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4896/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7461
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25323
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/853/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5605/rebuild

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

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2150/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4960
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3866
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4906/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/862/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/703
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/703/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/860
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/860/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4906
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4906/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7471/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25350
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/863/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
--- tests/acceptance-tests/test_nested_mir.cpp 2015-11-06 16:49:10 +0000
+++ tests/acceptance-tests/test_nested_mir.cpp 2015-11-20 10:56:42 +0000
@@ -738,7 +738,6 @@
738 mir_wait_for(mir_connection_apply_display_config(connection, configuration));738 mir_wait_for(mir_connection_apply_display_config(connection, configuration));
739739
740 mir_display_config_destroy(configuration);740 mir_display_config_destroy(configuration);
741 mir_surface_release_sync(painted_surface);
742741
743 // Wait for initial config to be applied742 // Wait for initial config to be applied
744 initial_condition.wait_for_at_most_seconds(1);743 initial_condition.wait_for_at_most_seconds(1);
@@ -749,6 +748,7 @@
749 EXPECT_CALL(*the_mock_display_configuration_report(), new_configuration(_))748 EXPECT_CALL(*the_mock_display_configuration_report(), new_configuration(_))
750 .WillRepeatedly(InvokeWithoutArgs([&] { condition.wake_up_everyone(); }));749 .WillRepeatedly(InvokeWithoutArgs([&] { condition.wake_up_everyone(); }));
751750
751 mir_surface_release_sync(painted_surface);
752 mir_connection_release(connection);752 mir_connection_release(connection);
753753
754 condition.wait_for_at_most_seconds(1);754 condition.wait_for_at_most_seconds(1);

Subscribers

People subscribed via source and target branches