Rev 4929: Move bzrlib.tests.ParamikoFeature to bzrlib.tests.features.paramiko in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available
John Arbash Meinel
john at arbash-meinel.com
Mon Dec 21 19:53:04 GMT 2009
At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available
------------------------------------------------------------
revno: 4929
revision-id: john at arbash-meinel.com-20091221195256-xkyn1k9o1nhjhi5z
parent: john at arbash-meinel.com-20091221194946-vytf3v60rtzosyq2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-module-available
timestamp: Mon 2009-12-21 13:52:56 -0600
message:
Move bzrlib.tests.ParamikoFeature to bzrlib.tests.features.paramiko
-------------- next part --------------
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2009-12-21 19:41:38 +0000
+++ b/bzrlib/tests/__init__.py 2009-12-21 19:52:56 +0000
@@ -4278,6 +4278,8 @@
return self.module_name
+# This is kept here for compatibility, it is recommended to use
+# 'bzrlib.tests.feature.paramiko' instead
ParamikoFeature = ModuleAvailableFeature('paramiko')
=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- a/bzrlib/tests/blackbox/test_selftest.py 2009-12-21 19:41:38 +0000
+++ b/bzrlib/tests/blackbox/test_selftest.py 2009-12-21 19:52:56 +0000
@@ -23,6 +23,7 @@
)
from bzrlib.errors import ParamikoNotPresent
from bzrlib.tests import (
+ features,
SubUnitFeature,
TestCase,
TestCaseInTempDir,
@@ -78,7 +79,7 @@
def test_transport_set_to_sftp(self):
# Test that we can pass a transport to the selftest core - sftp
# version.
- self.requireFeature(tests.ParamikoFeature)
+ self.requireFeature(features.paramiko)
params = self.get_params_passed_to_core('selftest --transport=sftp')
self.assertEqual(bzrlib.transport.sftp.SFTPAbsoluteServer,
params[1]["transport"])
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- a/bzrlib/tests/blackbox/test_serve.py 2009-12-18 21:54:54 +0000
+++ b/bzrlib/tests/blackbox/test_serve.py 2009-12-21 19:52:56 +0000
@@ -38,7 +38,6 @@
from bzrlib.smart import client, medium
from bzrlib.smart.server import BzrServerFactory, SmartTCPServer
from bzrlib.tests import (
- ParamikoFeature,
TestCaseWithMemoryTransport,
TestCaseWithTransport,
TestSkipped,
=== modified file 'bzrlib/tests/features.py'
--- a/bzrlib/tests/features.py 2009-12-21 19:41:38 +0000
+++ b/bzrlib/tests/features.py 2009-12-21 19:52:56 +0000
@@ -19,4 +19,5 @@
ApportFeature = tests.ModuleAvailableFeature('apport')
+paramiko = tests.ParamikoFeature
pycurl = tests.ModuleAvailableFeature('pycurl')
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py 2009-12-21 19:49:46 +0000
+++ b/bzrlib/tests/test_sftp_transport.py 2009-12-21 19:52:56 +0000
@@ -35,6 +35,7 @@
set_or_unset_env,
)
from bzrlib.tests import (
+ features,
TestCaseWithTransport,
TestCase,
TestSkipped,
@@ -43,7 +44,7 @@
from bzrlib.transport import get_transport
import bzrlib.transport.http
-if tests.ParamikoFeature.available():
+if features.paramiko.available():
from bzrlib.transport import sftp as _mod_sftp
from bzrlib.transport.sftp import (
SFTPAbsoluteServer,
@@ -70,7 +71,7 @@
def setUp(self):
super(TestCaseWithSFTPServer, self).setUp()
- self.requireFeature(tests.ParamikoFeature)
+ self.requireFeature(features.paramiko)
set_test_transport_to_sftp(self)
@@ -158,7 +159,7 @@
class SFTPNonServerTest(TestCase):
def setUp(self):
TestCase.setUp(self)
- self.requireFeature(tests.ParamikoFeature)
+ self.requireFeature(features.paramiko)
def test_parse_url_with_home_dir(self):
s = SFTPTransport('sftp://ro%62ey:h%40t@example.com:2222/~/relative')
@@ -299,7 +300,7 @@
"""
def setUp(self):
- self.requireFeature(tests.ParamikoFeature)
+ self.requireFeature(features.paramiko)
super(SSHVendorBadConnection, self).setUp()
import bzrlib.transport.ssh
@@ -411,7 +412,7 @@
def setUp(self):
TestCase.setUp(self)
- self.requireFeature(tests.ParamikoFeature)
+ self.requireFeature(features.paramiko)
def test_delay(self):
from bzrlib.transport.sftp import SocketDelay
@@ -472,7 +473,7 @@
class Test_SFTPReadvHelper(tests.TestCase):
def checkGetRequests(self, expected_requests, offsets):
- self.requireFeature(tests.ParamikoFeature)
+ self.requireFeature(features.paramiko)
helper = _mod_sftp._SFTPReadvHelper(offsets, 'artificial_test',
_null_report_activity)
self.assertEqual(expected_requests, helper._get_requests())
@@ -492,7 +493,7 @@
(42000, 24000)])
def checkRequestAndYield(self, expected, data, offsets):
- self.requireFeature(tests.ParamikoFeature)
+ self.requireFeature(features.paramiko)
helper = _mod_sftp._SFTPReadvHelper(offsets, 'artificial_test',
_null_report_activity)
data_f = ReadvFile(data)
=== modified file 'bzrlib/tests/test_transport.py'
--- a/bzrlib/tests/test_transport.py 2009-12-03 20:22:57 +0000
+++ b/bzrlib/tests/test_transport.py 2009-12-21 19:52:56 +0000
@@ -36,7 +36,7 @@
ReadError,
UnsupportedProtocol,
)
-from bzrlib.tests import ParamikoFeature, TestCase, TestCaseInTempDir
+from bzrlib.tests import features, TestCase, TestCaseInTempDir
from bzrlib.transport import (_clear_protocol_handlers,
_CoalescedOffset,
ConnectedTransport,
@@ -895,7 +895,7 @@
# A reasonable evolution for this would be to simply check inside
# check_channel_exec_request that the command is appropriate, and then
# satisfy requests in-process.
- self.requireFeature(ParamikoFeature)
+ self.requireFeature(features.paramiko)
# SFTPFullAbsoluteServer has a get_url method, and doesn't
# override the interface (doesn't change self._vendor).
# Note that this does encryption, so can be slow.
More information about the bazaar-commits
mailing list