Merge lp:~vanvugt/mir/fix-1315302 into lp:mir
Proposed by
Daniel van Vugt
Status: | Rejected |
---|---|
Rejected by: | Daniel van Vugt |
Proposed branch: | lp:~vanvugt/mir/fix-1315302 |
Merge into: | lp:mir |
Diff against target: |
127 lines (+43/-7) 3 files modified
src/server/compositor/switching_bundle.cpp (+8/-5) src/server/compositor/switching_bundle.h (+4/-2) tests/unit-tests/compositor/test_switching_bundle.cpp (+31/-0) |
To merge this branch: | bzr merge lp:~vanvugt/mir/fix-1315302 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Needs Fixing | ||
Robert Carr (community) | Approve | ||
Alexandros Frantzis (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Ensure that if you have multiple client_acquire's outstanding, they each
get called back, eventually (LP: #1315302)
To post a comment you must log in.
Unmerged revisions
- 1593. By Daniel van Vugt
-
Merge latest development-branch
- 1592. By Daniel van Vugt
-
Correct comment
- 1591. By Daniel van Vugt
-
Enable the failing test and fix it, using a queue of callbacks.
- 1590. By Daniel van Vugt
-
Add a regression test for LP: #1315302, currently failing.
FAILED: Continuous integration, rev:1592 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/1501/ jenkins. qa.ubuntu. com/job/ mir-android- utopic- i386-build/ 21 jenkins. qa.ubuntu. com/job/ mir-clang- utopic- amd64-build/ 22 jenkins. qa.ubuntu. com/job/ mir-mediumtests -utopic- touch/22 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- utopic- amd64-ci/ 18/console jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- utopic- amd64-ci/ 18/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- utopic- armhf-ci/ 18 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- utopic- armhf-ci/ 18/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/28 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/28/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-mediumtests -runner- mako/1294 s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 6700
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: 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/1501/ rebuild
http://