Rev 3136: Enhance accelerator_tree tests (abentley) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3136
revision-id:pqm at pqm.ubuntu.com-20071220173454-9nqwgm3k66f4bmj8
parent: pqm at pqm.ubuntu.com-20071220161634-2kcjb650o21ydko4
parent: abentley at panoramicfeedback.com-20071220163852-it2m717w4dmabt4f
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-12-20 17:34:54 +0000
message:
  Enhance accelerator_tree tests (abentley)
modified:
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
    ------------------------------------------------------------
    revno: 3123.5.19
    revision-id:abentley at panoramicfeedback.com-20071220163852-it2m717w4dmabt4f
    parent: abentley at panoramicfeedback.com-20071220152148-rn32up72gm3gankf
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: hardlinks
    timestamp: Thu 2007-12-20 11:38:52 -0500
    message:
      Ensure content is exactly the same, when accelerator used
    modified:
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2007-12-20 14:17:48 +0000
+++ b/bzrlib/tests/test_transform.py	2007-12-20 16:38:52 +0000
@@ -1515,8 +1515,14 @@
         source.lock_read()
         self.addCleanup(source.unlock)
         target = self.make_branch_and_tree('target')
-        build_tree(source.basis_tree(), target, source)
+        revision_tree = source.basis_tree()
+        revision_tree.lock_read()
+        self.addCleanup(revision_tree.unlock)
+        build_tree(revision_tree, target, source)
         self.assertEqual(['file1-id'], calls)
+        target.lock_read()
+        self.addCleanup(target.unlock)
+        self.assertEqual([], list(target._iter_changes(revision_tree)))
 
     def test_build_tree_accelerator_tree_missing_file(self):
         source = self.make_branch_and_tree('source')
@@ -1527,7 +1533,13 @@
         os.unlink('source/file1')
         source.remove(['file2'])
         target = self.make_branch_and_tree('target')
-        build_tree(source.basis_tree(), target, source)
+        revision_tree = source.basis_tree()
+        revision_tree.lock_read()
+        self.addCleanup(revision_tree.unlock)
+        build_tree(revision_tree, target, source)
+        target.lock_read()
+        self.addCleanup(target.unlock)
+        self.assertEqual([], list(target._iter_changes(revision_tree)))
 
     def test_build_tree_accelerator_wrong_kind(self):
         source = self.make_branch_and_tree('source')
@@ -1548,8 +1560,14 @@
         source.lock_read()
         self.addCleanup(source.unlock)
         target = self.make_branch_and_tree('target')
-        build_tree(source.basis_tree(), target, source)
+        revision_tree = source.basis_tree()
+        revision_tree.lock_read()
+        self.addCleanup(revision_tree.unlock)
+        build_tree(revision_tree, target, source)
         self.assertEqual([], calls)
+        target.lock_read()
+        self.addCleanup(target.unlock)
+        self.assertEqual([], list(target._iter_changes(revision_tree)))
 
 
 class MockTransform(object):