/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_server.py

Clarify some iable/method names in the test servers.

* bzrlib/tests/stub_sftp.py:
(SocketListener.__init__): '_connection_callback is more explicit
than '_callback'.
(SFTPServer._run_server_entry): Mention that SocketDelay is
probably ineffective for the connections themselves.
(SFTPServer._run_server): 'ready' is more explicit than 'event'.

* bzrlib/tests/http_server.py:
(HttpServer.run_server): 'run_server' is more explicit than
http_start.

Show diffs side-by-side

added added

removed removed

Lines of Context:
624
624
            self.host, self.port = self._httpd.server_address
625
625
        return self._httpd
626
626
 
627
 
    def _http_start(self, started):
 
627
    def run_server(self, started):
628
628
        """Server thread main entry point. """
629
629
        server = self._get_httpd()
630
630
        self._http_base_url = '%s://%s:%s/' % (self._url_protocol,
670
670
        # Create the server thread
671
671
        started = threading.Event()
672
672
        self._http_thread = test_server.ThreadWithException(
673
 
            event=started, target=self._http_start, args=(started,))
 
673
            event=started, target=self.run_server, args=(started,))
674
674
        self._http_thread.start()
675
675
        # Wait for the server thread to start (i.e release the lock)
676
676
        started.wait()