Rev 3041: Fix is_executable tests for win32 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3041
revision-id:pqm at pqm.ubuntu.com-20071128045852-9ii8fj85vxz1om46
parent: pqm at pqm.ubuntu.com-20071128013549-w54seazrf4oeywb9
parent: aaron.bentley at utoronto.ca-20071128020615-s9j44kvvnbvu1xju
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-11-28 04:58:52 +0000
message:
  Fix is_executable tests for win32
modified:
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
    ------------------------------------------------------------
    revno: 3034.2.1
    revision-id:aaron.bentley at utoronto.ca-20071128020615-s9j44kvvnbvu1xju
    parent: pqm at pqm.ubuntu.com-20071127023739-a1ajr28wi7so2up6
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: win32fixes
    timestamp: Tue 2007-11-27 21:06:15 -0500
    message:
      Fix is_executable tests for win32
    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-11-26 19:54:09 +0000
+++ b/bzrlib/tests/test_transform.py	2007-11-28 02:06:15 +0000
@@ -84,7 +84,9 @@
         self.assertRaises(ExistingPendingDeletion, self.get_transform)
 
     def test_build(self):
-        transform, root = self.get_transform() 
+        transform, root = self.get_transform()
+        self.wt.lock_tree_write()
+        self.addCleanup(self.wt.unlock)
         self.assertIs(transform.get_tree_parent(root), ROOT_PARENT)
         imaginary_id = transform.trans_id_tree_path('imaginary')
         imaginary_id2 = transform.trans_id_tree_path('imaginary/')
@@ -127,6 +129,8 @@
 
     def test_convenience(self):
         transform, root = self.get_transform()
+        self.wt.lock_tree_write()
+        self.addCleanup(self.wt.unlock)
         trans_id = transform.new_file('name', root, 'contents', 
                                       'my_pretties', True)
         oz = transform.new_directory('oz', root, 'oz-id')
@@ -578,6 +582,8 @@
         """
         transform, root = self.get_transform()
         wt = transform._tree
+        wt.lock_read()
+        self.addCleanup(wt.unlock)
         transform.new_file('set_on_creation', root, 'Set on creation', 'soc',
                            True)
         sac = transform.new_file('set_after_creation', root,