Merge lp://qastaging/~charlesk/libdbusmenu/fix-json-tests into lp://qastaging/libdbusmenu/12.10
Proposed by
Charles Kerr
| Status: | Merged |
|---|---|
| Approved by: | Lars Karlitski |
| Approved revision: | 425 |
| Merged at revision: | 423 |
| Proposed branch: | lp://qastaging/~charlesk/libdbusmenu/fix-json-tests |
| Merge into: | lp://qastaging/libdbusmenu/12.10 |
| Diff against target: |
21 lines (+2/-2) 1 file modified
tests/Makefile.am (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~charlesk/libdbusmenu/fix-json-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lars Karlitski (community) | Approve | ||
|
Review via email:
|
|||
Commit message
In the unit tests, don't ignore the return value of test-json-client and test-json-server
Description of the change
The test-json* tests are failing about 3/4 of the time on my machine due to timing issues caused by the dbus-test-runner behavior described in bug #1053168
test-json-server and test-json-client always return 0 which should make dbus-test-runner happy unless one of the tasks is abort()ed somehow, in which case the test should fail anyway. So test-json*'s use of --ignore-return is unnecessary anyway.
This patch removes test-json*'s use of --ignore-return.
To post a comment you must log in.
Revision history for this message
| Charles Kerr (charlesk) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks correct.