launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/test-thread-debug into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


This branch has test_network for the branch puller use FixedHttpServer, rather than HttpServer, which looks to solve the threading issue.
-- 
https://code.launchpad.net/~stevenk/launchpad/test-thread-debug/+merge/38510
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/test-thread-debug into lp:launchpad/devel.

=== modified file 'lib/lp/codehosting/puller/tests/test_worker.py'
--- lib/lp/codehosting/puller/tests/test_worker.py	2010-08-20 20:31:18 +0000
+++ lib/lp/codehosting/puller/tests/test_worker.py	2010-10-15 08:51:53 +0000
@@ -31,13 +31,13 @@
     TestCaseInTempDir,
     TestCaseWithTransport,
     )
-from bzrlib.tests.http_server import HttpServer
 from bzrlib.transport import get_transport
 
 from lp.code.enums import BranchType
 from lp.codehosting.puller.tests import (
     AcceptAnythingPolicy,
     BlacklistPolicy,
+    FixedHttpServer,
     PullerWorkerMixin,
     WhitelistPolicy,
     )
@@ -698,7 +698,7 @@
 
     def getHttpServerForCwd(self):
         """Get an `HttpServer` instance that serves from '.'."""
-        server = HttpServer()
+        server = FixedHttpServer()
         server.start_server()
         self.addCleanup(server.stop_server)
         # The gc.collect allows the threads behind any HTTP requests to exit.