Merge lp://qastaging/~larsu/dbus-test-runner/fix-test-race into lp://qastaging/dbus-test-runner/15.10
Status: | Merged |
---|---|
Approved by: | Iain Lane |
Approved revision: | 96 |
Merged at revision: | 96 |
Proposed branch: | lp://qastaging/~larsu/dbus-test-runner/fix-test-race |
Merge into: | lp://qastaging/dbus-test-runner/15.10 |
Diff against target: |
65 lines (+22/-3) 2 files modified
tests/Makefile.am (+2/-2) tests/test-own-name.c (+20/-1) |
To merge this branch: | bzr merge lp://qastaging/~larsu/dbus-test-runner/fix-test-race |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+270488@code.qastaging.launchpad.net |
Commit message
test-param-
Calling RequestName with gdbus-tool to signal the tested binary that a name is owned is racy: since the name is only owned very shortly, the watch might not have been established before the name is already gone again.
Fix this by holding on to the name a bit longer with the test-own-name helper (add a --system flag to that). A better fix would be to only start the second task when the watch has been established. dbus-test-runner always starts tasks in parallel though and changing this would further complicate its command line interface.
Description of the change
test-param-
Calling RequestName with gdbus-tool to signal the tested binary that a name is owned is racy: since the name is only owned very shortly, the watch might not have been established before the name is already gone again.
Fix this by holding on to the name a bit longer with the test-own-name helper (add a --system flag to that). A better fix would be to only start the second task when the watch has been established. dbus-test-runner always starts tasks in parallel though and changing this would further complicate its command line interface.
PASSED: Continuous integration, rev:96 jenkins. qa.ubuntu. com/job/ dbus-test- runner- ci/38/ jenkins. qa.ubuntu. com/job/ dbus-test- runner- wily-amd64- ci/2 jenkins. qa.ubuntu. com/job/ dbus-test- runner- wily-armhf- ci/2 jenkins. qa.ubuntu. com/job/ dbus-test- runner- wily-i386- ci/2
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/dbus- test-runner- ci/38/rebuild
http://