← 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: Martin
  • Date: 2009-11-07 08:02:13 UTC
  • mfrom: (4789 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4809.
  • Revision ID: gzlist@googlemail.com-20091107080213-jad185091b3l69ih
Merge bzr.dev 4789 to resolve conflict from the disabling of plink auto-detection, and relocate NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ssh_transport.py
76
76
        manager = TestSSHVendorManager()
77
77
        self.assertRaises(SSHVendorNotFound, manager.get_vendor, {})
78
78
        manager.set_ssh_version_string("plink")
79
 
        self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
 
79
        # Auto-detect of plink vendor disabled, on Windows recommended
 
80
        # default ssh-client is paramiko
 
81
        # see https://bugs.launchpad.net/bugs/414743
 
82
        #~self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
 
83
        self.assertRaises(SSHVendorNotFound, manager.get_vendor, {})
80
84
 
81
85
    def test_cached_vendor(self):
82
86
        manager = TestSSHVendorManager()