Merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-test-timer-stopped into lp://qastaging/ubuntuone-control-panel
Proposed by
Mike McCracken
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 385 |
| Merged at revision: | 387 |
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-control-panel/fix-test-timer-stopped |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
11 lines (+1/-0) 1 file modified
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-test-timer-stopped |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Trivial fix to make a test in test_folders actually run.
The test wasn't using the inlineCallbacks decorator, so it never returned from the first yield, but this wasn't treated as an error, the test passed.
Tested on mac/win/ubuntu 12.10
Description of the change
- Trivial fix to make a test in test_folders actually run.
To post a comment you must log in.
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
