← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_sftp_transport.py

merge permissions branch, also fixup tests so they are lined up with bzr.dev to help prevent conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
18
18
import socket
19
19
import threading
20
20
 
21
 
from bzrlib.tests import TestCaseInTempDir, TestCase
 
21
from bzrlib.tests import TestCaseInTempDir, TestCase, TestSkipped
22
22
from bzrlib.tests.test_transport import TestTransportMixIn
23
23
import bzrlib.errors as errors
24
24
from bzrlib.osutils import pathjoin, lexists
104
104
 
105
105
    def setUp(self):
106
106
        TestCaseInTempDir.setUp(self)
 
107
        if not paramiko_loaded:
 
108
            raise TestSkipped('you must have paramiko to run this test')
107
109
        self._root = self.test_dir
108
110
        self._is_setup = False
109
111
 
190
192
 
191
193
 
192
194
class SFTPNonServerTest(TestCase):
 
195
    def setUp(self):
 
196
        TestCase.setUp(self)
 
197
        if not paramiko_loaded:
 
198
            raise TestSkipped('you must have paramiko to run this test')
 
199
 
193
200
    def test_parse_url(self):
194
201
        from bzrlib.transport.sftp import SFTPTransport
195
202
        s = SFTPTransport('sftp://simple.example.com/%2fhome/source', clone_from=fake)
306
313
        self.assertEquals(b2.revision_history(), ['a1', 'a2'])
307
314
 
308
315
 
309
 
if not paramiko_loaded:
310
 
    # TODO: Skip these
311
 
    del SFTPTransportTest
312
 
    del SFTPNonServerTest
313
 
    del SFTPBranchTest