Mir

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

fix-1517990
Merge into development-branch

Proposed by Alexandros Frantzis on 2015-11-20

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
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2015-11-20
Alan Griffiths		2015-11-20	Approve on 2015-11-20
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.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-20:

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 on 2015-11-20:

LGTM

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-11-20:

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alexandros Frantzis

Emanuele Antonio Faraone

Gerry Boland

Mir development team

1	=== modified file 'tests/acceptance-tests/test_nested_mir.cpp'
2	--- tests/acceptance-tests/test_nested_mir.cpp 2015-11-06 16:49:10 +0000
3	+++ tests/acceptance-tests/test_nested_mir.cpp 2015-11-20 10:56:42 +0000
4	@@ -738,7 +738,6 @@
5	mir_wait_for(mir_connection_apply_display_config(connection, configuration));
6
7	mir_display_config_destroy(configuration);
8	- mir_surface_release_sync(painted_surface);
9
10	// Wait for initial config to be applied
11	initial_condition.wait_for_at_most_seconds(1);
12	@@ -749,6 +748,7 @@
13	EXPECT_CALL(*the_mock_display_configuration_report(), new_configuration(_))
14	.WillRepeatedly(InvokeWithoutArgs([&] { condition.wake_up_everyone(); }));
15
16	+ mir_surface_release_sync(painted_surface);
17	mir_connection_release(connection);
18
19	condition.wait_for_at_most_seconds(1);