← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_server.py

merge bzr.dev 4807, resolve test conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
462
462
                raise httplib.UnknownProtocol(proto_vers)
463
463
            else:
464
464
                self._httpd = self.create_httpd(serv_cls, rhandler)
465
 
            host, self.port = self._httpd.socket.getsockname()
 
465
            self.host, self.port = self._httpd.socket.getsockname()
466
466
        return self._httpd
467
467
 
468
468
    def _http_start(self):