/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 breezy/tests/blackbox/test_status.py

  • Committer: Jelmer Vernooij
  • Date: 2018-08-08 02:14:32 UTC
  • mfrom: (7063 work)
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180808021432-nomib3je4cu2xqkm
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_status.py
236
236
        self.assertStatus([
237
237
                '?   bye.c\n',
238
238
                '?   dir2/\n',
 
239
                '?   directory/hello.c\n',
239
240
                '+!  missing.c\n',
240
 
                '?   directory/hello.c\n'
241
241
                ],
242
242
                wt, short=True)
243
243
 
401
401
                              r'.*ERROR: Path\(s\) do not exist: '
402
402
                              'NONEXISTENT.*')
403
403
        expected = [
 
404
          ' M  FILE_B\n',
 
405
          ' M  FILE_C\n',
404
406
          ' D  FILE_E\n',
405
 
          ' M  FILE_C\n',
406
 
          ' M  FILE_B\n',
407
407
          'X   NONEXISTENT\n',
408
408
          ]
409
409
        out, err = self.run_bzr('status --short NONEXISTENT '
435
435
                              r'.*ERROR: Path\(s\) do not exist: '
436
436
                              'ANOTHER_NONEXISTENT NONEXISTENT.*')
437
437
        expected = [
 
438
          ' M  FILE_B\n',
 
439
          ' M  FILE_C\n',
438
440
          ' D  FILE_E\n',
439
 
          ' M  FILE_C\n',
440
 
          ' M  FILE_B\n',
441
441
          'X   ANOTHER_NONEXISTENT\n',
442
442
          'X   NONEXISTENT\n',
443
443
          ]