/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_selftest.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-03 14:08:55 UTC
  • mto: (4797.12.1 2.1-integration)
  • mto: This revision was merged to the branch mainline in revision 5017.
  • Revision ID: v.ladeuil+lp@free.fr-20100203140855-yuwq660bb3jayr1d
Stop requiring testtools for sftp use.

* bzrlib/transport/sftp.py: 
Move the test servers code to tests.stub_sftp.
(get_test_permutations): Import the test servers only when the
tests are run.

* bzrlib/tests/test_transport.py:
(TestSSHConnections.test_bzr_connect_to_bzr_ssh): Get the tests
servers from tests.stub_sftp.

* bzrlib/tests/test_sftp_transport.py: 
Get the tests servers  from tests.stub_sftp.

* bzrlib/tests/stub_sftp.py: 
Fix imports, move the test servers code from transport.sftp.

* bzrlib/tests/blackbox/test_selftest.py: 
Fix imports.

* bzrlib/builtins.py:
(cmd_selftest.get_transport_type): Fix the test sftp server
import.

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
    )
63
63
from bzrlib.tests import (
64
64
    features,
 
65
    stub_sftp,
65
66
    test_lsprof,
66
67
    test_sftp_transport,
67
68
    TestUtil,
1927
1928
 
1928
1929
    def test_transport_sftp(self):
1929
1930
        self.requireFeature(features.paramiko)
1930
 
        self.check_transport_set(bzrlib.transport.sftp.SFTPAbsoluteServer)
 
1931
        self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
1931
1932
 
1932
1933
    def test_transport_memory(self):
1933
1934
        self.check_transport_set(bzrlib.transport.memory.MemoryServer)