Merge lp:~mir-team/mir/fix-1245336.2 into lp:mir
Proposed by
Daniel van Vugt
Status: | Rejected |
---|---|
Rejected by: | Daniel van Vugt |
Proposed branch: | lp:~mir-team/mir/fix-1245336.2 |
Merge into: | lp:mir |
Diff against target: |
186 lines (+76/-6) 7 files modified
include/test/mir_test_framework/display_server_test_fixture.h (+3/-0) include/test/mir_test_framework/process.h (+2/-0) include/test/mir_test_framework/testing_process_manager.h (+2/-0) tests/acceptance-tests/test_server_shutdown.cpp (+8/-6) tests/mir_test_framework/display_server_test_fixture.cpp (+10/-0) tests/mir_test_framework/process.cpp (+33/-0) tests/mir_test_framework/testing_process_manager.cpp (+18/-0) |
To merge this branch: | bzr merge lp:~mir-team/mir/fix-1245336.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Disapprove | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+193035@code.launchpad.net |
Commit message
Avoid a race condition that could lead to spurious failures of server
shutdown tests (LP: #1245336)
The race is between the acceptance-tests process and its child server process.
In our signal/abort tests, it's possible the server process may start and
stop so quickly that the parent process doesn't have time to detect the
socket file (before it's correctly cleaned up).
To post a comment you must log in.
PASSED: Continuous integration, rev:1173 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/281/ jenkins. qa.ubuntu. com/job/ mir-android- trusty- i386-build/ 37 jenkins. qa.ubuntu. com/job/ mir-clang- trusty- amd64-build/ 36 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 10 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 10/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 10 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 10/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: 10.97.0. 26:8080/ job/mir- team-mir- development- branch- ci/281/ rebuild
http://