Rev 2231: Deal with some more review comments. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

[Andrew Bennetts]

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

------------------------------------------------------------
revno: 2231
revision-id: andrew.bennetts at canonical.com-20070417091629-2do340norot15cs5
parent: andrew.bennetts at canonical.com-20070417090153-a7apw9czzedpt4nk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Tue 2007-04-17 19:16:29 +1000
message:
  Deal with some more review comments.
modified:
  bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
  bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
=== modified file 'bzrlib/tests/branch_implementations/test_locking.py'
--- a/bzrlib/tests/branch_implementations/test_locking.py	2007-04-13 01:57:12 +0000
+++ b/bzrlib/tests/branch_implementations/test_locking.py	2007-04-17 09:16:29 +0000
@@ -18,7 +18,7 @@
 
 from bzrlib import errors
 from bzrlib.branch import BzrBranchFormat4
-from bzrlib.remote import RemoteBranchFormat
+from bzrlib.bzrdir import RemoteBzrDirFormat
 from bzrlib.tests import TestSkipped
 from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
 from bzrlib.tests.lock_helpers import TestPreventLocking, LockWrapper
@@ -36,9 +36,9 @@
         # 'control_files' member. So we should fail gracefully if
         # not there. But assuming it has them lets us test the exact 
         # lock/unlock order.
-        if isinstance(self.branch_format, RemoteBranchFormat):
+        if isinstance(self.bzrdir_format, RemoteBzrDirFormat):
             raise TestSkipped(
-                "RemoteBranches don't have 'control_files'.")
+                "RemoteRepository objects don't have 'control_files'.")
         self.locks = []
         b = LockWrapper(self.locks, self.get_branch(), 'b')
         b.repository = LockWrapper(self.locks, b.repository, 'r')

=== modified file 'bzrlib/tests/bzrdir_implementations/__init__.py'
--- a/bzrlib/tests/bzrdir_implementations/__init__.py	2006-11-29 03:43:35 +0000
+++ b/bzrlib/tests/bzrdir_implementations/__init__.py	2007-04-17 09:16:29 +0000
@@ -50,8 +50,6 @@
     loader = TestLoader()
     adapt_modules(test_bzrdir_implementations, adapter, loader, result)
 
-    ## >>>>>>>
-    # XXX:
     # This will always add the tests for smart server transport, regardless of
     # the --transport option the user specified to 'bzr selftest'.
     from bzrlib.smart.server import SmartTCPServer_for_testing, ReadonlySmartTCPServer_for_testing
@@ -69,6 +67,5 @@
                   TestLoader(),
                   smart_server_suite)
     result.addTests(smart_server_suite)
-    ## >>>>>>>
 
     return result