← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_server.py

  • Committer: Vincent Ladeuil
  • Date: 2011-02-10 12:37:27 UTC
  • mto: This revision was merged to the branch mainline in revision 5661.
  • Revision ID: v.ladeuil+lp@free.fr-20110210123727-8e0pu4wtlt6fj7nf
thread is already a python module, avoid confusion and use cethread instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_server.py
22
22
 
23
23
 
24
24
from bzrlib import (
 
25
    cethread,
25
26
    osutils,
26
 
    thread,
27
27
    transport,
28
28
    urlutils,
29
29
    )
243
243
        raise NotImplementedError
244
244
 
245
245
 
246
 
class TestThread(thread.CatchingExceptionThread):
 
246
class TestThread(cethread.CatchingExceptionThread):
247
247
 
248
248
    def join(self, timeout=5):
249
249
        """Overrides to use a default timeout.