Launchpad itself

Merge lp:~lifeless/launchpad/threads into lp:launchpad

  1. threads
  2. Merge into devel
Proposed by Robert Collins
Status: Merged
Approved by: Robert Collins
Approved revision: no longer in the source branch.
Merged at revision: 11761
Proposed branch: lp:~lifeless/launchpad/threads
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
lib/canonical/testing/layers.py (+1/-1)
To merge this branch: bzr merge lp:~lifeless/launchpad/threads
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Steve Kowalik (community) code* Approve
Tim Penhey mentor Pending
Review via email: mp+38908@code.launchpad.net

Description of the change

Fix our test suite headaches with windmill

To post a comment you must log in.
Revision history for this message
Steve Kowalik (stevenk) :
review: Approve (code*)
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Do it.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/canonical/testing/layers.py'
2--- lib/canonical/testing/layers.py 2010-10-17 05:02:20 +0000
3+++ lib/canonical/testing/layers.py 2010-10-20 04:06:42 +0000
4@@ -331,7 +331,7 @@
5 if thread not in BaseLayer._threads and thread.isAlive()]
6
7 if BaseLayer.disable_thread_check:
8- new_threads = new_live_threads()
9+ new_threads = None
10 else:
11 for loop in range(0,100):
12 # Check for tests that leave live threads around early.