Rev 2427: Make "test_info_locking" an expected failure on win32 for now. in http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/dirstate_locking_fixes

John Arbash Meinel john at arbash-meinel.com
Thu Apr 19 23:26:16 BST 2007


At http://bzr.arbash-meinel.com/branches/bzr/0.16-dev/dirstate_locking_fixes

------------------------------------------------------------
revno: 2427
revision-id: john at arbash-meinel.com-20070419222604-f3cfi8gqdu4bky6t
parent: john at arbash-meinel.com-20070419182756-rdg6e8zoaxy9mg9q
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_locking_fixes
timestamp: Thu 2007-04-19 17:26:04 -0500
message:
  Make "test_info_locking" an expected failure on win32 for now.
modified:
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
-------------- next part --------------
=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- a/bzrlib/tests/blackbox/test_info.py	2007-04-04 11:40:26 +0000
+++ b/bzrlib/tests/blackbox/test_info.py	2007-04-19 22:26:04 +0000
@@ -1108,6 +1108,12 @@
         :param repo_locked: If true, expect the repository to be locked.
         :param verbose: If true, expect verbose output
         """
+        if tree_locked and sys.platform == 'win32':
+            # Arguably neither can Linux, but for now OS Locks are
+            # not exclusive in-process.
+            args = command_string.split(' ')
+            self.run_bzr_error([], 'info', *args)
+            return
         out, err = self.runbzr('info %s' % command_string)
         if repo_locked or branch_locked or tree_locked:
             def locked_message(a_bool):
@@ -1285,6 +1291,10 @@
             lco_tree.branch.repository.lock_write()
             lco_tree.branch.unlock()
 
+        if sys.platform == 'win32':
+            self.knownFailure('Win32 cannot run "bzr info"'
+                              ' when the tree is locked.')
+
     def test_info_locking_oslocks(self):
         if sys.platform == "win32":
             raise TestSkipped("don't use oslocks on win32 in unix manner")



More information about the bazaar-commits mailing list