← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_info.py

  • Committer: Martin Pool
  • Date: 2007-04-24 05:02:04 UTC
  • mfrom: (2449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2450.
  • Revision ID: mbp@sourcefrog.net-20070424050204-bfkc1qiq0axt5f14
Merge trunk & fix NEWS conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
1108
1108
        :param repo_locked: If true, expect the repository to be locked.
1109
1109
        :param verbose: If true, expect verbose output
1110
1110
        """
 
1111
        if tree_locked and sys.platform == 'win32':
 
1112
            # We expect this to fail because of locking errors. (A write-locked
 
1113
            # file cannot be read-locked in the same process).
 
1114
            # This should be removed when the locking errors are fixed.
 
1115
            args = command_string.split(' ')
 
1116
            self.run_bzr_error([], 'info', *args)
 
1117
            return
1111
1118
        out, err = self.runbzr('info %s' % command_string)
1112
1119
        if repo_locked or branch_locked or tree_locked:
1113
1120
            def locked_message(a_bool):
1285
1292
            lco_tree.branch.repository.lock_write()
1286
1293
            lco_tree.branch.unlock()
1287
1294
 
 
1295
        if sys.platform == 'win32':
 
1296
            self.knownFailure('Win32 cannot run "bzr info"'
 
1297
                              ' when the tree is locked.')
 
1298
 
1288
1299
    def test_info_locking_oslocks(self):
1289
1300
        if sys.platform == "win32":
1290
1301
            raise TestSkipped("don't use oslocks on win32 in unix manner")