Rev 2449: (John Arbash Meinel) Small updates for 'bzr info' tests and win32 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 2449
revision-id: pqm at pqm.ubuntu.com-20070424033735-s0igieajv2czb2tt
parent: pqm at pqm.ubuntu.com-20070424031208-9y04a1j0yx3fjte5
parent: john at arbash-meinel.com-20070424025510-qyl1mc76r4sscj53
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-04-24 04:37:35 +0100
message:
  (John Arbash Meinel) Small updates for 'bzr info' tests and win32
modified:
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
    ------------------------------------------------------------
    revno: 2425.3.3
    merged: john at arbash-meinel.com-20070424025510-qyl1mc76r4sscj53
    parent: john at arbash-meinel.com-20070419222604-f3cfi8gqdu4bky6t
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate_locking_fixes
    timestamp: Mon 2007-04-23 21:55:10 -0500
    message:
      Update comment according to Martin
    ------------------------------------------------------------
    revno: 2425.3.2
    merged: 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 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-24 02:55:10 +0000
@@ -1108,6 +1108,13 @@
         :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':
+            # We expect this to fail because of locking errors. (A write-locked
+            # file cannot be read-locked in the same process).
+            # This should be removed when the locking errors are fixed.
+            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 +1292,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")