← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ssh_transport.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2010-10-05 02:12:48 UTC
  • mto: This revision was merged to the branch mainline in revision 5468.
  • Revision ID: nmb@wartburg.edu-20101005021248-74kzkjrqsmv13sm3
https://launchpad.net/bugs/561061
dont force openssh to use protocol=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ssh_transport.py
160
160
            vendor._get_vendor_specific_argv(
161
161
                "user", "host", 100, command=["bzr"]),
162
162
            ["ssh", "-oForwardX11=no", "-oForwardAgent=no",
163
 
                "-oClearAllForwardings=yes", "-oProtocol=2",
 
163
                "-oClearAllForwardings=yes",
164
164
                "-oNoHostAuthenticationForLocalhost=yes",
165
165
                "-p", "100",
166
166
                "-l", "user",
173
173
            vendor._get_vendor_specific_argv(
174
174
                "user", "host", 100, subsystem="sftp"),
175
175
            ["ssh", "-oForwardX11=no", "-oForwardAgent=no",
176
 
                "-oClearAllForwardings=yes", "-oProtocol=2",
 
176
                "-oClearAllForwardings=yes",
177
177
                "-oNoHostAuthenticationForLocalhost=yes",
178
178
                "-p", "100",
179
179
                "-l", "user",