/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/test_selftest.py

  • Committer: Martin Packman
  • Date: 2011-11-08 17:07:23 UTC
  • mto: This revision was merged to the branch mainline in revision 6247.
  • Revision ID: martin.packman@canonical.com-20111108170723-ys88gzmjz9sh2k15
Allow any number of intermingled lines rather than just zero or one

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
3359
3359
        # so permit extra lines between each part of the error output.
3360
3360
        self.assertContainsRe(out,
3361
3361
            "Traceback.*:\n"
3362
 
            "(?:.*\n)?"
 
3362
            "(?:.*\n)*"
3363
3363
            ".+ in fork_for_tests\n"
3364
 
            "(?:.*\n)?"
 
3364
            "(?:.*\n)*"
3365
3365
            "\s*workaround_zealous_crypto_random\(\)\n"
3366
 
            "(?:.*\n)?"
 
3366
            "(?:.*\n)*"
3367
3367
            "TypeError:")
3368
3368
 
3369
3369