Rev 2528: Cleaning. in file:///v/home/vila/src/experimental/bzr.connection.sharing/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Fri Jun 8 13:12:07 BST 2007
At file:///v/home/vila/src/experimental/bzr.connection.sharing/
------------------------------------------------------------
revno: 2528
revision-id: v.ladeuil+lp at free.fr-20070608121205-3yf92bbzzca9tgpm
parent: v.ladeuil+lp at free.fr-20070608085227-dkwzu18gxemnwwha
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.connection.sharing
timestamp: Fri 2007-06-08 14:12:05 +0200
message:
Cleaning.
modified:
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_breakin.py'
--- a/bzrlib/tests/blackbox/test_breakin.py 2007-06-08 08:52:27 +0000
+++ b/bzrlib/tests/blackbox/test_breakin.py 2007-06-08 12:12:05 +0000
@@ -44,9 +44,7 @@
proc = self.start_bzr_subprocess(self._test_process_args,
env_changes=dict(BZR_SIGQUIT_PDB=None))
# wait for it to get started, and print the 'listening' line
- print 'bzr server started in test_breakin with pid: %d' % proc.pid
proc.stdout.readline()
- print 'stdout read'
# first sigquit pops into debugger
os.kill(proc.pid, signal.SIGQUIT)
proc.stdin.write("q\n")
@@ -58,9 +56,7 @@
proc = self.start_bzr_subprocess(self._test_process_args,
env_changes=dict(BZR_SIGQUIT_PDB=None))
# wait for it to get started, and print the 'listening' line
- print 'bzr server started in test_breakin_harder with pid: %d' % proc.pid
proc.stdout.readline()
- print 'stdout read'
# another hit gives the default behaviour of terminating it
os.kill(proc.pid, signal.SIGQUIT)
# wait for it to go into pdb
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py 2007-06-06 14:26:08 +0000
+++ b/bzrlib/tests/test_sftp_transport.py 2007-06-08 12:12:05 +0000
@@ -133,6 +133,7 @@
"""Test the SFTP transport with homedir based relative paths."""
def setUp(self):
+ # Only SFTPHomeDirServer is tested here
self._get_remote_is_absolute = False
super(SFTPTransportTestRelativeRoot, self).setUp()
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py 2007-06-08 08:52:27 +0000
+++ b/bzrlib/transport/__init__.py 2007-06-08 12:12:05 +0000
@@ -1029,6 +1029,9 @@
return False
def _reuse_for(self, other_base):
+ # This is really needed for ConnectedTransport only, but it's easier to
+ # have Transport refuses to be reused than testing that the reuse
+ # should be asked to ConnectedTransport only.
return None
class ConnectedTransport(Transport):
@@ -1356,12 +1359,11 @@
possible_transports.append(transport)
return transport
- # We tried all the different protocols, now try one last
- # time as a local protocol
+ # We tried all the different protocols, now try one last time
+ # as a local protocol
base = convert_path_to_url(base, 'Unsupported protocol: %s')
- # The default handler is the filesystem handler, stored
- # as protocol None
+ # The default handler is the filesystem handler, stored as protocol None
factory_list = transport_list_registry.get(None)
transport, last_err = _try_transport_factories(base, factory_list)
=== modified file 'bzrlib/transport/http/_pycurl.py'
--- a/bzrlib/transport/http/_pycurl.py 2007-06-07 11:36:27 +0000
+++ b/bzrlib/transport/http/_pycurl.py 2007-06-08 12:12:05 +0000
@@ -103,7 +103,8 @@
# First connection ever. There is no credentials for pycurl, either
# the password was embedded in the URL or it's not needed. The
# connection for pycurl is just the Curl object, it will not
- # connect until the first request
+ # connect to the http server until the first request (which had
+ # just called us).
connection = pycurl.Curl()
self._set_connection(connection, None)
return connection
=== modified file 'bzrlib/transport/http/_urllib2_wrappers.py'
--- a/bzrlib/transport/http/_urllib2_wrappers.py 2007-05-04 10:26:43 +0000
+++ b/bzrlib/transport/http/_urllib2_wrappers.py 2007-06-08 12:12:05 +0000
@@ -235,7 +235,6 @@
handler_order = 1000 # after all pre-processings
- # FIXME: instrument or refactor to allow testing for mutiple connections
def create_connection(self, request, http_connection_class):
host = request.get_host()
if not host:
=== modified file 'bzrlib/transport/remote.py'
--- a/bzrlib/transport/remote.py 2007-06-08 08:52:27 +0000
+++ b/bzrlib/transport/remote.py 2007-06-08 12:12:05 +0000
@@ -135,7 +135,6 @@
if from_transport is not None:
_medium = from_transport._medium
else:
- import pdb; pdb.set_trace()
_medium = None
# No credentials
self._set_connection(_medium, None)
More information about the bazaar-commits
mailing list