← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport.py
36
36
                           ReadError,
37
37
                           UnsupportedProtocol,
38
38
                           )
39
 
from bzrlib.tests import ParamikoFeature, TestCase, TestCaseInTempDir
 
39
from bzrlib.tests import features, TestCase, TestCaseInTempDir
40
40
from bzrlib.transport import (_clear_protocol_handlers,
41
41
                              _CoalescedOffset,
42
42
                              ConnectedTransport,
895
895
        # A reasonable evolution for this would be to simply check inside
896
896
        # check_channel_exec_request that the command is appropriate, and then
897
897
        # satisfy requests in-process.
898
 
        self.requireFeature(ParamikoFeature)
 
898
        self.requireFeature(features.paramiko)
899
899
        # SFTPFullAbsoluteServer has a get_url method, and doesn't
900
900
        # override the interface (doesn't change self._vendor).
901
901
        # Note that this does encryption, so can be slow.