Merge lp:~fginther/bamf/ignore-kill-return into lp:bamf/0.4
Status: | Merged |
---|---|
Approved by: | Ted Gould |
Approved revision: | 504 |
Merged at revision: | 506 |
Proposed branch: | lp:~fginther/bamf/ignore-kill-return |
Merge into: | lp:bamf/0.4 |
Diff against target: |
12 lines (+1/-1) 1 file modified
tests/run-xvfb.sh (+1/-1) |
To merge this branch: | bzr merge lp:~fginther/bamf/ignore-kill-return |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+138316@code.launchpad.net |
Commit message
Fix test failure caused when xvfb exits before script has a chance to kill it on script exit
The xvfb process may or may not be present when the test script exits. Allow this with the addition of "||true".
Description of the change
When running headless tests, the xvfb process may have already exited when the run-xvfb.sh script test tries to kill it. These leads to the test returning failure.
The fix is to add "|| true" to the kill command, effectively causing the kill return value to be ignored.
Testing:
- "make check" with headless tests enabled.
- Built inside quantal and raring pbuilder chroots with headless tests enabled.
- Tested in jenkins environment where problem was originally reported.
It seems fair here...