/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_sftp_transport.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
23
23
import bzrlib.errors as errors
24
24
from bzrlib.osutils import pathjoin, lexists, set_or_unset_env
25
25
from bzrlib.tests import TestCaseWithTransport, TestCase, TestSkipped
 
26
from bzrlib.tests.HttpServer import HttpServer
26
27
import bzrlib.transport
27
28
from bzrlib.transport import get_transport
28
29
import bzrlib.transport.http
44
45
        testcase.transport_server = SFTPAbsoluteServer
45
46
    else:
46
47
        testcase.transport_server = SFTPHomeDirServer
47
 
    testcase.transport_readonly_server = bzrlib.transport.http.HttpServer
 
48
    testcase.transport_readonly_server = HttpServer
48
49
 
49
50
 
50
51
class TestCaseWithSFTPServer(TestCaseWithTransport):
380
381
            # paramiko, but we know about it, so we don't have to
381
382
            # fail the test
382
383
            raise TestSkipped('Known NameError bug with paramiko-1.6.1')
383
 
        self.assertContainsRe(err, 'Connection error')
 
384
        self.assertContainsRe(err, r'bzr: ERROR: Unable to connect to SSH host'
 
385
                                   r' 127\.0\.0\.1:\d+; ')
384
386
 
385
387
 
386
388
class SFTPLatencyKnob(TestCaseWithSFTPServer):