Rev 4948: Clean up a few more imports. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-unregister-mem-trans

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-unregister-mem-trans

------------------------------------------------------------
revno: 4948
revision-id: john at arbash-meinel.com-20100108200304-i0xp20kkotbh1q3e
parent: john at arbash-meinel.com-20100108172825-xk36gcsssz2zomtw
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-unregister-mem-trans
timestamp: Fri 2010-01-08 14:03:04 -0600
message:
  Clean up a few more imports.
  
  Switch the setUp and tearDown calls now that it is a new api.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_transport.py'
--- a/bzrlib/tests/test_transport.py	2010-01-08 17:28:25 +0000
+++ b/bzrlib/tests/test_transport.py	2010-01-08 20:03:04 +0000
@@ -29,7 +29,9 @@
     urlutils,
     )
 from bzrlib.transport import (
+    fakenfs,
     memory,
+    readonly,
     )
 from bzrlib.errors import (DependencyNotPresent,
                            FileExists,
@@ -262,12 +264,12 @@
 
     def test_create_server(self):
         server = memory.MemoryServer()
-        server.setUp()
+        server.start_server()
         url = server.get_url()
         self.assertTrue(url in _mod_transport.transport_list_registry)
         t = _mod_transport.get_transport(url)
         del t
-        server.tearDown()
+        server.stop_server()
         self.assertFalse(url in _mod_transport.transport_list_registry)
         self.assertRaises(errors.UnsupportedProtocol,
                           _mod_transport.get_transport, url)
@@ -558,7 +560,6 @@
     """Readonly decoration specific tests."""
 
     def test_local_parameters(self):
-        import bzrlib.transport.readonly as readonly
         # connect to . in readonly mode
         transport = readonly.ReadonlyTransportDecorator('readonly+.')
         self.assertEqual(True, transport.listable())
@@ -566,7 +567,6 @@
 
     def test_http_parameters(self):
         from bzrlib.tests.http_server import HttpServer
-        import bzrlib.transport.readonly as readonly
         # connect to '.' via http which is not listable
         server = HttpServer()
         self.start_server(server)
@@ -581,7 +581,6 @@
     """NFS decorator specific tests."""
 
     def get_nfs_transport(self, url):
-        import bzrlib.transport.fakenfs as fakenfs
         # connect to url with nfs decoration
         return fakenfs.FakeNFSTransportDecorator('fakenfs+' + url)
 
@@ -601,13 +600,12 @@
         self.start_server(server)
         transport = self.get_nfs_transport(server.get_url())
         self.assertIsInstance(
-            transport, bzrlib.transport.fakenfs.FakeNFSTransportDecorator)
+            transport, fakenfs.FakeNFSTransportDecorator)
         self.assertEqual(False, transport.listable())
         self.assertEqual(True, transport.is_readonly())
 
     def test_fakenfs_server_default(self):
         # a FakeNFSServer() should bring up a local relpath server for itself
-        import bzrlib.transport.fakenfs as fakenfs
         server = fakenfs.FakeNFSServer()
         self.start_server(server)
         # the url should be decorated appropriately