Rev 2211: Fix four tests I broke with the Branch.lock_write changes. in sftp://bazaar.launchpad.net/%7Ebzr/bzr/hpss/

[Andrew Bennetts]

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

------------------------------------------------------------
revno: 2211
revision-id: andrew.bennetts at canonical.com-20070412162221-6imfutzivlmg4rg5
parent: andrew.bennetts at canonical.com-20070412080451-xyxdwlwrxgca1mzy
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss
timestamp: Fri 2007-04-13 02:22:21 +1000
message:
  Fix four tests I broke with the Branch.lock_write changes.
modified:
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
=== modified file 'bzrlib/tests/test_smart.py'
--- a/bzrlib/tests/test_smart.py	2007-04-12 07:08:33 +0000
+++ b/bzrlib/tests/test_smart.py	2007-04-12 16:22:21 +0000
@@ -283,7 +283,9 @@
         backing = self.get_transport()
         request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
         b = self.make_branch('.')
-        branch_token, repo_token = b.lock_write()
+        branch_token = b.lock_write()
+        repo_token = b.repository.lock_write()
+        b.repository.unlock()
         try:
             self.assertEqual(SmartServerResponse(('ok',)),
                 request.execute(
@@ -295,7 +297,9 @@
         backing = self.get_transport()
         request = smart.branch.SmartServerBranchRequestSetLastRevision(backing)
         b = self.make_branch('.')
-        branch_token, repo_token = b.lock_write()
+        branch_token = b.lock_write()
+        repo_token = b.repository.lock_write()
+        b.repository.unlock()
         try:
             revision_id = 'non-existent revision'
             self.assertEqual(
@@ -317,7 +321,9 @@
         r1 = tree.commit('1st commit', rev_id=rev_id)
         r2 = tree.commit('2nd commit')
         tree.unlock()
-        branch_token, repo_token = tree.branch.lock_write()
+        branch_token = tree.branch.lock_write()
+        repo_token = tree.branch.repository.lock_write()
+        tree.branch.repository.unlock()
         try:
             self.assertEqual(
                 SmartServerResponse(('ok',)),
@@ -340,7 +346,9 @@
         r2 = tree.commit('2nd commit')
         tree.unlock()
         tree.branch.set_revision_history([])
-        branch_token, repo_token = tree.branch.lock_write()
+        branch_token = tree.branch.lock_write()
+        repo_token = tree.branch.repository.lock_write()
+        tree.branch.repository.unlock()
         try:
             self.assertEqual(
                 SmartServerResponse(('ok',)),