Launchpad itself

Merge lp:~stevenk/launchpad/test-thread-debug into lp:launchpad

  1. test-thread-debug
  2. Merge into devel
Proposed by Steve Kowalik on 2010-10-15
Status: Merged
Merged at revision: 11713
Proposed branch: lp:~stevenk/launchpad/test-thread-debug
Merge into: lp:launchpad
Diff against target: 27 lines (+2/-2)
1 file modified
lib/lp/codehosting/puller/tests/test_worker.py (+2/-2)
To merge this branch: bzr merge lp:~stevenk/launchpad/test-thread-debug
Reviewer Review Type Date Requested Status
Abel Deuring (community) code 2010-10-15 Approve on 2010-10-15
Review via email: mp+38510@code.launchpad.net

Description of the Change

This branch has test_worker for the branch puller use FixedHttpServer, rather than HttpServer, which looks to solve the threading issue.

To post a comment you must log in.
Abel Deuring (adeuring) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/codehosting/puller/tests/test_worker.py'
2--- lib/lp/codehosting/puller/tests/test_worker.py 2010-08-20 20:31:18 +0000
3+++ lib/lp/codehosting/puller/tests/test_worker.py 2010-10-15 08:51:53 +0000
4@@ -31,13 +31,13 @@
5 TestCaseInTempDir,
6 TestCaseWithTransport,
7 )
8-from bzrlib.tests.http_server import HttpServer
9 from bzrlib.transport import get_transport
10
11 from lp.code.enums import BranchType
12 from lp.codehosting.puller.tests import (
13 AcceptAnythingPolicy,
14 BlacklistPolicy,
15+ FixedHttpServer,
16 PullerWorkerMixin,
17 WhitelistPolicy,
18 )
19@@ -698,7 +698,7 @@
20
21 def getHttpServerForCwd(self):
22 """Get an `HttpServer` instance that serves from '.'."""
23- server = HttpServer()
24+ server = FixedHttpServer()
25 server.start_server()
26 self.addCleanup(server.stop_server)
27 # The gc.collect allows the threads behind any HTTP requests to exit.