← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_test_server.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_test_server.py
224
224
 
225
225
            def handle_connection(self):
226
226
                req = self.rfile.readline()
227
 
                threading.currentThread().set_event(sync)
 
227
                threading.currentThread().set_ready_event(sync)
228
228
                raise FailToRespond()
229
229
 
230
230
        server = self.get_server(
246
246
            def handle(self):
247
247
                # We want to sync with the thread that is serving the
248
248
                # connection.
249
 
                threading.currentThread().set_event(sync)
 
249
                threading.currentThread().set_ready_event(sync)
250
250
                raise CantServe()
251
251
 
252
252
        server = self.get_server(