Rev 2833: Fix #140614 selftest noise re _http_start in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2833
revision-id: pqm at pqm.ubuntu.com-20070919101753-4e8wasie12tewyjv
parent: pqm at pqm.ubuntu.com-20070919080453-w4ygh8iu73fdc25i
parent: v.ladeuil+lp at free.fr-20070919092224-uz4lglet41yu8pvg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-09-19 11:17:53 +0100
message:
  Fix #140614 selftest noise re _http_start
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/HttpServer.py     httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
    ------------------------------------------------------------
    revno: 2832.1.1
    merged: v.ladeuil+lp at free.fr-20070919092224-uz4lglet41yu8pvg
    parent: pqm at pqm.ubuntu.com-20070919080453-w4ygh8iu73fdc25i
    parent: v.ladeuil+lp at free.fr-20070918155554-ufhp8sywu3jb5cc3
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: bzr.integration
    timestamp: Wed 2007-09-19 11:22:24 +0200
    message:
      Fix #140614 selftest noise re _http_start
    ------------------------------------------------------------
    revno: 2831.2.1
    merged: v.ladeuil+lp at free.fr-20070918155554-ufhp8sywu3jb5cc3
    parent: pqm at pqm.ubuntu.com-20070918045733-es6jch43pxvogvhj
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: 140614
    timestamp: Tue 2007-09-18 17:55:54 +0200
    message:
      Fix #140614 selftest _http_start noise by respecting semaphores.
      
      * HttpServer.py:
      (HttpServer._http_start): Set the timeout *before* releasing the
      semaphore or it may fail semi-randomly.
=== modified file 'NEWS'
--- a/NEWS	2007-09-19 06:44:55 +0000
+++ b/NEWS	2007-09-19 09:22:24 +0000
@@ -52,6 +52,9 @@
      paramiko.
      (Vincent Ladeuil, #59150)
 
+   * Fix selftest semi-random noise during http related tests.
+     (Vincent Ladeuil, #140614)
+
   API BREAKS:
 
    * The ``VersionedFile`` interface now allows content checks to be bypassed

=== modified file 'bzrlib/tests/HttpServer.py'
--- a/bzrlib/tests/HttpServer.py	2007-09-17 15:48:23 +0000
+++ b/bzrlib/tests/HttpServer.py	2007-09-18 15:55:54 +0000
@@ -326,8 +326,8 @@
         self._http_base_url = '%s://%s:%s/' % (self._url_protocol,
                                                self.host,
                                                self.port)
-        self._http_starting.release()
         httpd.socket.settimeout(0.1)
+        self._http_starting.release()
 
         while self._http_running:
             try: