← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_trace.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_trace.py
113
113
        msg = _format_exception()
114
114
        # Even though Windows and Linux differ for 'os.rmdir', they both give
115
115
        # 'No such file' for open()
116
 
        # However it now gets translated so we can not test for a specific message
117
116
        self.assertContainsRe(msg,
118
 
            r'^bzr: ERROR: \[Errno .*\] .*nosuchfile')
 
117
            r'^bzr: ERROR: \[Errno .*\] No such file.*nosuchfile')
119
118
 
120
119
    def test_format_pywintypes_error(self):
121
120
        self.requireFeature(features.pywintypes)