Rev 4809: Some tests *did* know that the repo was write locked in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-test-kipple

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b4-test-kipple

------------------------------------------------------------
revno: 4809
revision-id: john at arbash-meinel.com-20091118171041-zcizhane79vnq6uo
parent: john at arbash-meinel.com-20091118170128-y56lbsuew16cyvy2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b4-test-kipple
timestamp: Wed 2009-11-18 11:10:41 -0600
message:
  Some tests *did* know that the repo was write locked
  
  however, lets make all tests that use assertInitializeEx know that.
-------------- next part --------------
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- a/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-11-18 17:01:28 +0000
+++ b/bzrlib/tests/per_bzrdir/test_bzrdir.py	2009-11-18 17:10:41 +0000
@@ -1235,9 +1235,6 @@
             return
         self.assertNotEqual(repo.bzrdir.root_transport.base,
             made_repo.bzrdir.root_transport.base)
-        # New repositories are write locked.
-        self.assertTrue(made_repo.is_write_locked())
-        made_repo.unlock()
 
     def test_format_initialize_on_transport_ex_force_new_repo_False(self):
         t = self.get_transport('repo')
@@ -1250,7 +1247,6 @@
         if control is None:
             # uninitialisable format
             return
-        self.addCleanup(made_repo.unlock)
         if not isinstance(control._format, (bzrdir.BzrDirFormat5,
             bzrdir.BzrDirFormat6,)):
             self.assertEqual(repo.bzrdir.root_transport.base,
@@ -1271,9 +1267,6 @@
             # uninitialisable format
             return
         self.assertLength(1, repo._fallback_repositories)
-        # New repositories are write locked.
-        self.assertTrue(repo.is_write_locked())
-        repo.unlock()
 
     def test_format_initialize_on_transport_ex_default_stack_on(self):
         # When initialize_on_transport_ex uses a stacked-on branch because of
@@ -1296,7 +1289,7 @@
         repo_name = repo_fmt.repository_format.network_name()
         repo, control = self.assertInitializeEx(
             t, need_meta=True, repo_format_name=repo_name, stacked_on=None)
-        self.addCleanup(repo.unlock)
+        # self.addCleanup(repo.unlock)
         if control is None:
             # uninitialisable format
             return
@@ -1328,9 +1321,6 @@
             # must stay with the all-in-one-format.
             repo_name = self.bzrdir_format.network_name()
         self.assertEqual(repo_name, repo._format.network_name())
-        # New repositories are write locked.
-        self.assertTrue(repo.is_write_locked())
-        repo.unlock()
 
     def assertInitializeEx(self, t, need_meta=False, **kwargs):
         """Execute initialize_on_transport_ex and check it succeeded correctly.
@@ -1348,6 +1338,10 @@
             return None, None
         repo, control, require_stacking, repo_policy = \
             self.bzrdir_format.initialize_on_transport_ex(t, **kwargs)
+        if repo is not None:
+            # Repositories are open write-locked
+            self.assertTrue(repo.is_write_locked())
+            self.addCleanup(repo.unlock)
         self.assertIsInstance(control, bzrdir.BzrDir)
         opened = bzrdir.BzrDir.open(t.base)
         expected_format = self.bzrdir_format