~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-06-22 18:24:25 UTC
  • mfrom: (1803 +trunk)
  • mto: (1793.3.6 bundle-fixes)
  • mto: This revision was merged to the branch mainline in revision 1806.
  • Revision ID: john@arbash-meinel.com-20060622182425-6f45cb7acd587216
[merge] bzr.dev 1804 and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
70
70
        
71
71
        out, err = self.run_bzr('init', 'subdir2/nothere', retcode=3)
72
72
        self.assertEqual('', out)
73
 
        self.failUnless(err.startswith(
74
 
            'bzr: ERROR: exceptions.OSError: '
75
 
            '[Errno 2] No such file or directory: '))
 
73
        self.assertContainsRe(err,
 
74
            r'^bzr: ERROR: .*'
 
75
            '\[Errno 2\] No such file or directory: ')
76
76
        
77
77
        os.mkdir('subdir2')
78
78
        out, err = self.run_bzr('init', 'subdir2')