← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-11 18:49:54 UTC
  • mfrom: (6060.1.4 2.5-win32-fixes)
  • Revision ID: pqm@pqm.ubuntu.com-20110811184954-7z846r214w274v8h
(vila) Small test suite fixes for Windows. (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
1062
1062
                self.expectFailure("No absolute truth", self.assertTrue, True)
1063
1063
        runner = tests.TextTestRunner(stream=StringIO())
1064
1064
        result = self.run_test_runner(runner, Test("test_truth"))
1065
 
        if testtools_version <= (0, 9, 11):
 
1065
        if testtools_version[:3] <= (0, 9, 11):
1066
1066
            self.assertContainsRe(runner.stream.getvalue(),
1067
1067
                "=+\n"
1068
1068
                "FAIL: \\S+\.test_truth\n"
1251
1251
            lambda trace=False: "ascii")
1252
1252
        result = self.run_test_runner(tests.TextTestRunner(stream=out),
1253
1253
            FailureWithUnicode("test_log_unicode"))
1254
 
        if testtools_version > (0, 9, 11):
 
1254
        if testtools_version[:3] > (0, 9, 11):
1255
1255
            self.assertContainsRe(out.getvalue(), "log: {{{\d+\.\d+  \\\\u2606}}}")
1256
1256
        else:
1257
1257
            self.assertContainsRe(out.getvalue(),