/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2007-12-20 00:56:46 UTC
  • mfrom: (3131 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3133.
  • Revision ID: aaron.bentley@utoronto.ca-20071220005646-cfebcxoxqtpsk3uo
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
1146
1146
            except errors.PathNotChild:
1147
1147
                return path
1148
1148
 
1149
 
        if tree_locked and sys.platform == 'win32':
1150
 
            # We expect this to fail because of locking errors. (A write-locked
1151
 
            # file cannot be read-locked in the same process).
 
1149
        if tree_locked:
 
1150
            # We expect this to fail because of locking errors.
 
1151
            # (A write-locked file cannot be read-locked
 
1152
            # in the different process -- either on win32 or on linux).
1152
1153
            # This should be removed when the locking errors are fixed.
1153
 
            self.run_bzr_error([], 'info ' + command_string)
1154
 
            return
 
1154
            self.expectFailure('OS locks are exclusive '
 
1155
                'for different processes (Bug #174055)',
 
1156
                self.run_bzr_subprocess,
 
1157
                'info ' + command_string)
1155
1158
        out, err = self.run_bzr('info %s' % command_string)
1156
1159
        description = {
1157
1160
            (True, True): 'Lightweight checkout',