← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server/medusa_based.py

  • Committer: John Arbash Meinel
  • Date: 2010-09-25 20:08:01 UTC
  • mfrom: (5444 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5445.
  • Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/ftp_server/medusa_based.py
254
254
        self._async_thread = threading.Thread(
255
255
                target=FTPTestServer._asyncore_loop_ignore_EBADF,
256
256
                kwargs={'timeout':0.1, 'count':10000})
 
257
        if 'threads' in tests.selftest_debug_flags:
 
258
            sys.stderr.write('Thread started: %s\n'
 
259
                             % (self._async_thread.ident,))
257
260
        self._async_thread.setDaemon(True)
258
261
        self._async_thread.start()
259
262
 
261
264
        self._ftp_server.close()
262
265
        asyncore.close_all()
263
266
        self._async_thread.join()
 
267
        if 'threads' in tests.selftest_debug_flags:
 
268
            sys.stderr.write('Thread  joined: %s\n'
 
269
                             % (self._async_thread.ident,))
264
270
 
265
271
    @staticmethod
266
272
    def _asyncore_loop_ignore_EBADF(*args, **kwargs):