← 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: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

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
 
        # because autodetection of plink vendor is temporary disabled
80
 
        # next test is no longer pass. so it's disabled as well.
81
 
        #~self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
82
 
        # expect error instead (bialix 20071115)
83
 
        self.assertRaises(SSHVendorNotFound, manager.get_vendor, {})
 
79
        self.assertIsInstance(manager.get_vendor({}), PLinkSubprocessVendor)
84
80
 
85
81
    def test_cached_vendor(self):
86
82
        manager = TestSSHVendorManager()
188
184
        self.assertEqual(
189
185
            vendor._get_vendor_specific_argv(
190
186
                "user", "host", 100, command=["bzr"]),
191
 
            ["plink", "-x", "-a", "-ssh", "-2",
 
187
            ["plink", "-x", "-a", "-ssh", "-2", "-batch",
192
188
                "-P", "100",
193
189
                "-l", "user",
194
190
                "host", "bzr"]
199
195
        self.assertEqual(
200
196
            vendor._get_vendor_specific_argv(
201
197
                "user", "host", 100, subsystem="sftp"),
202
 
            ["plink", "-x", "-a", "-ssh", "-2",
 
198
            ["plink", "-x", "-a", "-ssh", "-2", "-batch",
203
199
                "-P", "100",
204
200
                "-l", "user",
205
201
                "-s", "host", "sftp"]