← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Wouter van Heyst
  • Date: 2011-05-18 14:59:24 UTC
  • mto: This revision was merged to the branch mainline in revision 5893.
  • Revision ID: larstiq@larstiq.dyndns.org-20110518145924-l0ab360t1f6xpnee
Paper over different sorting order in pypy by sorting th expected and actual lists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
477
477
          ' M  FILE_B\n',
478
478
          'X   NONEXISTENT\n',
479
479
          ]
 
480
        expected.sort()
480
481
        out, err = self.run_bzr('status --short NONEXISTENT '
481
482
                                'FILE_A FILE_B UNVERSIONED_BUT_EXISTING '
482
483
                                'FILE_C FILE_D FILE_E FILE_Q', retcode=3)
483
 
        self.assertEqual(expected, out.splitlines(True))
 
484
        actual = out.splitlines(True)
 
485
        actual.sort()
 
486
        self.assertEqual(expected, actual)
484
487
        self.assertContainsRe(err,
485
488
                              r'.*ERROR: Path\(s\) do not exist: '
486
489
                              'NONEXISTENT.*')