← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-30 15:19:36 UTC
  • mto: (5247.6.7 http-leaks)
  • mto: This revision was merged to the branch mainline in revision 5396.
  • Revision ID: v.ladeuil+lp@free.fr-20100630151936-bwh082le0i52p8ez
Fixed as per jam's review.

* bzrlib/tests/test_server.py:
* bzrlib/tests/test_http.py:
* bzrlib/tests/http_server.py:
* bzrlib/tests/ftp_server/pyftpdlib_based.py:
* bzrlib/tests/ftp_server/medusa_based.py:
Use sys.stderr.write() rather than print for thread dbugging trace.

* bzrlib/osutils.py:
(connect_socket): Remove the timeout parameter.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
236
236
            event=self._ready, target=self._accept_read_and_reply)
237
237
        self._thread.start()
238
238
        if 'threads' in tests.selftest_debug_flags:
239
 
            print 'Thread started: %s' % (self._thread.ident,)
 
239
            sys.stderr.write('Thread started: %s\n' % (self._thread.ident,))
240
240
        self._ready.wait()
241
241
 
242
242
    def _accept_read_and_reply(self):
266
266
        self.port = None
267
267
        self._thread.join()
268
268
        if 'threads' in tests.selftest_debug_flags:
269
 
            print 'Thread  joined: %s' % (self._thread.ident,)
 
269
            sys.stderr.write('Thread  joined: %s\n' % (self._thread.ident,))
270
270
 
271
271
 
272
272
class TestAuthHeader(tests.TestCase):