[MERGE] Repository.is_write_locked and break-lock test tweaks.

Ian Clatworthy ian.clatworthy at internode.on.net
Mon Oct 15 02:55:47 BST 2007


Robert Collins wrote:
> This patch adds Repository.is_write_locked, which should be obvious, and
> changes the break_lock tests to allow for repositories like bzr-svn, and
> packs where 'lock_write' gives a logical lock but does not force mutual
> exclusion - multiple writers are supported.

bb:resubmit

Can you please resubmit with the code for test_is_write_lock.py and
test_break_lock.py inside the right files? :-) It looks like you
duplicated the file then went ahead and edited the wrong one.

I'm also seeing a very different diff when I apply your patch to
repository_implementations/__init__.py. Your emails suggests a one line
change when I get this the differences below vs bzr.dev 2906. Is there
another patch this one depends on?

Ian C.
--------------

=== modified file 'bzrlib/tests/repository_implementations/__init__.py'
--- bzrlib/tests/repository_implementations/__init__.py 2007-10-12
01:52:29 +0000
+++ bzrlib/tests/repository_implementations/__init__.py 2007-10-15
01:30:33 +0000
@@ -524,6 +524,28 @@


 def test_suite():
+    result = TestSuite()
+    test_repository_implementations = [
+        'bzrlib.tests.repository_implementations.test_break_lock',
+        'bzrlib.tests.repository_implementations.test_commit_builder',
+        'bzrlib.tests.repository_implementations.test_fetch',
+        'bzrlib.tests.repository_implementations.test_fileid_involved',
+        'bzrlib.tests.repository_implementations.test_has_same_location',
+        'bzrlib.tests.repository_implementations.test_is_write_locked',
+
'bzrlib.tests.repository_implementations.test_iter_reverse_revision_history',
+        'bzrlib.tests.repository_implementations.test_pack',
+        'bzrlib.tests.repository_implementations.test_reconcile',
+        'bzrlib.tests.repository_implementations.test_repository',
+        'bzrlib.tests.repository_implementations.test_revision',
+        'bzrlib.tests.repository_implementations.test_statistics',
+        'bzrlib.tests.repository_implementations.test_write_group',
+        ]
+
+    from bzrlib.smart.server import (
+        SmartTCPServer_for_testing,
+        ReadonlySmartTCPServer_for_testing,
+        )
+    from bzrlib.remote import RemoteBzrDirFormat, RemoteRepositoryFormat

     registry = repository.format_registry
     all_formats = [registry.get(k) for k in registry.keys()]



More information about the bazaar mailing list