Merge lp://qastaging/~mikemc/ubuntuone-client/fix-zipq-tests-threadhang into lp://qastaging/ubuntuone-client
Proposed by
Mike McCracken
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 1371 |
| Merged at revision: | 1372 |
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-client/fix-zipq-tests-threadhang |
| Merge into: | lp://qastaging/ubuntuone-client |
| Diff against target: |
14 lines (+4/-0) 1 file modified
tests/syncdaemon/test_action_queue.py (+4/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-client/fix-zipq-tests-threadhang |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Use fake callInThread to test ZipQueue, works around bug in threadpool closing on darwin.
Description of the change
- Use fake callInThread to test ZipQueue, works around bug in threadpool closing on darwin.
Without this branch, three of the TestZipQueue tests would succeed but hang just before printing '[OK]'. They were waiting for their thread pools to join. There appears to be a bug in twisted's threadpool implementation, maybe just on darwin. This works around it by just running the compress function (which is fake here anyway) in the main thread.
on darwin and windows:
% u1trial -e -t TestZip --reactor=twisted tests/syncdaemo
on linux, that or any superset.
To post a comment you must log in.
Revision history for this message
| Roberto Alsina (ralsina) | # |
review:
Approve
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
