Rev 6243: (jelmer) Support SmartSSHMedium.__repr__ support for missing usernames. in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6243 [merge]
revision-id: pqm at pqm.ubuntu.com-20111107184325-e5u0eqepo588s0uh
parent: pqm at pqm.ubuntu.com-20111107171235-wf4yf2zza518tp2q
parent: jelmer at samba.org-20111107172115-fzg7rhlac1imzl9t
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2011-11-07 18:43:25 +0000
message:
  (jelmer) Support SmartSSHMedium.__repr__ support for missing usernames.
   (Jelmer Vernooij)
modified:
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
=== modified file 'bzrlib/smart/medium.py'
--- a/bzrlib/smart/medium.py	2011-10-03 08:15:39 +0000
+++ b/bzrlib/smart/medium.py	2011-11-07 17:21:15 +0000
@@ -953,10 +953,14 @@
             maybe_port = ''
         else:
             maybe_port = ':%s' % self._ssh_params.port
-        return "%s(%s://%s@%s%s/)" % (
+        if self._ssh_params.username is None:
+            maybe_user = ''
+        else:
+            maybe_user = '%s@' % self._ssh_params.username
+        return "%s(%s://%s%s%s/)" % (
             self.__class__.__name__,
             self._scheme,
-            self._ssh_params.username,
+            maybe_user,
             self._ssh_params.host,
             maybe_port)
 

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2011-10-12 16:00:13 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2011-11-07 17:21:15 +0000
@@ -359,6 +359,27 @@
             ],
             vendor.calls)
 
+    def test_ssh_client_repr(self):
+        client_medium = medium.SmartSSHClientMedium(
+            'base', medium.SSHParams("example.com", "4242", "username"))
+        self.assertEquals(
+            "SmartSSHClientMedium(bzr+ssh://username@example.com:4242/)",
+            repr(client_medium))
+
+    def test_ssh_client_repr_no_port(self):
+        client_medium = medium.SmartSSHClientMedium(
+            'base', medium.SSHParams("example.com", None, "username"))
+        self.assertEquals(
+            "SmartSSHClientMedium(bzr+ssh://username@example.com/)",
+            repr(client_medium))
+
+    def test_ssh_client_repr_no_username(self):
+        client_medium = medium.SmartSSHClientMedium(
+            'base', medium.SSHParams("example.com", None, None))
+        self.assertEquals(
+            "SmartSSHClientMedium(bzr+ssh://example.com/)",
+            repr(client_medium))
+
     def test_ssh_client_ignores_disconnect_when_not_connected(self):
         # Doing a disconnect on a new (and thus unconnected) SSH medium
         # does not fail.  It's ok to disconnect an unconnected medium.