Rev 2153: Skip BoundSFTPTests when a workingtree can't be created at a non-local URL. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

Andrew Bennetts andrew.bennetts at canonical.com
Mon Mar 5 07:09:52 GMT 2007


At sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

------------------------------------------------------------
revno: 2153
revision-id: andrew.bennetts at canonical.com-20070305070421-y8wp2a7j7ymymyyk
parent: andrew.bennetts at canonical.com-20070305060419-g6jwzbokqechgsp1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Mon 2007-03-05 18:04:21 +1100
message:
  Skip BoundSFTPTests when a workingtree can't be created at a non-local URL.
modified:
  bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
=== modified file 'bzrlib/tests/branch_implementations/test_bound_sftp.py'
--- a/bzrlib/tests/branch_implementations/test_bound_sftp.py	2007-01-30 20:58:25 +0000
+++ b/bzrlib/tests/branch_implementations/test_bound_sftp.py	2007-03-05 07:04:21 +0000
@@ -30,6 +30,7 @@
                            BzrDirMetaFormat1,
                            )
 import bzrlib.errors as errors
+from bzrlib.tests import TestSkipped
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer, paramiko_loaded
 
 
@@ -38,8 +39,11 @@
     def create_branches(self):
         self.build_tree(['base/', 'base/a', 'base/b'])
         format = bzrdir.format_registry.make_bzrdir('knit')
-        wt_base = BzrDir.create_standalone_workingtree('base',
-            format=format)
+        try:
+            wt_base = BzrDir.create_standalone_workingtree(
+                self.get_url('base'), format=format)
+        except errors.NotLocalUrl:
+            raise TestSkipped('Not a local URL')
     
         b_base = wt_base.branch
 
@@ -62,7 +66,10 @@
 
     def test_simple_binding(self):
         self.build_tree(['base/', 'base/a', 'base/b', 'child/'])
-        wt_base = BzrDir.create_standalone_workingtree('base')
+        try:
+            wt_base = BzrDir.create_standalone_workingtree(self.get_url('base'))
+        except errors.NotLocalUrl:
+            raise TestSkipped('Not a local URL')
 
         wt_base.add('a')
         wt_base.add('b')




More information about the bazaar-commits mailing list