Merge lp:~afrantzis/mir/fix-1306464 into lp:mir
Proposed by
Alexandros Frantzis
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alan Griffiths | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 1550 | ||||
Proposed branch: | lp:~afrantzis/mir/fix-1306464 | ||||
Merge into: | lp:mir | ||||
Diff against target: |
153 lines (+85/-11) 3 files modified
include/test/mir_test/wait_condition.h (+11/-4) src/server/compositor/switching_bundle.cpp (+17/-7) tests/unit-tests/compositor/test_switching_bundle.cpp (+57/-0) |
||||
To merge this branch: | bzr merge lp:~afrantzis/mir/fix-1306464 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Approve | ||
Alberto Aguirre (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+215387@code.launchpad.net |
Commit message
compositor: Don't block in SwitchingBundle
Description of the change
compositor: Don't block in SwitchingBundle
Fixes https:/
To post a comment you must log in.
PASSED: Continuous integration, rev:1547 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/1312/ jenkins. qa.ubuntu. com/job/ mir-android- trusty- i386-build/ 1576 jenkins. qa.ubuntu. com/job/ mir-clang- trusty- amd64-build/ 1574 jenkins. qa.ubuntu. com/job/ mir-mediumtests -trusty- touch/1149 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 1044 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 1044/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 1049 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 1049/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- trusty- armhf/1150 jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- trusty- armhf/1150/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/1065 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 5959
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- team-mir- development- branch- ci/1312/ rebuild
http://