~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_server.py

  • Committer: Vincent Ladeuil
  • Date: 2009-10-08 17:19:38 UTC
  • mto: (5247.1.1 first-try)
  • mto: This revision was merged to the branch mainline in revision 5396.
  • Revision ID: v.ladeuil+lp@free.fr-20091008171938-e72q9ipz1h3l5thd
Implement a new -Ethreads to better track the leaks.
* bzrlib/tests/test_http.py:
(RecordingServer.setUp, RecordingServer.tearDown): Implement -Ethreads.

* bzrlib/tests/http_server.py:
(HttpServer.setUp, HttpServer.tearDown): Implement -Ethreads.

* bzrlib/tests/ftp_server/pyftpdlib_based.py:
(FTPTestServer.setUp, FTPTestServer.tearDown): Implement -Ethreads.

* bzrlib/tests/ftp_server/medusa_based.py:
(FTPTestServer.setUp, FTPTestServer.tearDown): Implement -Ethreads.

* bzrlib/tests/__init__.py:
(TestCase._check_leaked_threads): Implement -Ethreads.
(ChrootedTestCase.setUp): Fix some imports.

* bzrlib/builtins.py:
(cmd_selftest.run): Fix some imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
30
30
import urllib
31
31
import urlparse
32
32
 
33
 
from bzrlib import transport
 
33
from bzrlib import (
 
34
    tests,
 
35
    transport,
 
36
    )
34
37
from bzrlib.transport import local
35
38
 
36
39
 
601
604
        self._http_thread.setDaemon(True)
602
605
        self._http_exception = None
603
606
        self._http_thread.start()
 
607
        if 'threads' in tests.selftest_debug_flags:
 
608
            print 'Thread started: %s' % (self._http_thread.ident,)
604
609
 
605
610
        # Wait for the server thread to start (i.e release the lock)
606
611
        self._http_starting.acquire()
617
622
        self._http_running = False
618
623
        self._httpd.shutdown()
619
624
        self._http_thread.join()
 
625
        if 'threads' in tests.selftest_debug_flags:
 
626
            print 'Thread  joined: %s' % (self._http_thread.ident,)
620
627
        del self._http_thread
621
628
        self._http_thread = None
622
629