← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

Merge sftp-leaks into catch-them-all resolving conflicts

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):
329
329
        server.start_server()
330
330
        self.assertTrue(server.server is not None)
331
331
        self.assertTrue(server.server.serving is not None)
332
 
        self.assertTrue(server.server.serving.isSet())
 
332
        self.assertTrue(server.server.serving)
333
333
 
334
334
    def test_create_http_server_one_zero(self):
335
335
        class RequestHandlerOneZero(http_server.TestingHTTPRequestHandler):