← 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: Jelmer Vernooij
  • Date: 2011-05-16 13:39:39 UTC
  • mto: (5923.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5925.
  • Revision ID: jelmer@samba.org-20110516133939-8u1pc9utas3uw1lt
https://launchpad.net/bugs/592083
Require a unicode prompt to be passed into all methods that prompt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
1083
1083
            '\n'
1084
1084
            'OK \\(known_failures=1\\)\n')
1085
1085
 
1086
 
    def test_unexpected_success_bad(self):
1087
 
        class Test(tests.TestCase):
1088
 
            def test_truth(self):
1089
 
                self.expectFailure("No absolute truth", self.assertTrue, True)
1090
 
        runner = tests.TextTestRunner(stream=StringIO())
1091
 
        result = self.run_test_runner(runner, Test("test_truth"))
1092
 
        self.assertContainsRe(runner.stream.getvalue(),
1093
 
            "=+\n"
1094
 
            "FAIL: \\S+\.test_truth\n"
1095
 
            "-+\n"
1096
 
            "(?:.*\n)*"
1097
 
            "No absolute truth\n"
1098
 
            "(?:.*\n)*"
1099
 
            "-+\n"
1100
 
            "Ran 1 test in .*\n"
1101
 
            "\n"
1102
 
            "FAILED \\(failures=1\\)\n\\Z")
1103
 
 
1104
1086
    def test_result_decorator(self):
1105
1087
        # decorate results
1106
1088
        calls = []
2195
2177
        content, result = self.run_subunit_stream('test_unexpected_success')
2196
2178
        self.assertContainsRe(content, '(?m)^log$')
2197
2179
        self.assertContainsRe(content, 'test with unexpected success')
2198
 
        # GZ 2011-05-18: Old versions of subunit treat unexpected success as a
2199
 
        #                success, if a min version check is added remove this
2200
 
        from subunit import TestProtocolClient as _Client
2201
 
        if _Client.addUnexpectedSuccess.im_func is _Client.addSuccess.im_func:
2202
 
            self.expectFailure('subunit treats "unexpectedSuccess"'
2203
 
                               ' as a plain success',
2204
 
                self.assertEqual, 1, len(result.unexpectedSuccesses))
 
2180
        self.expectFailure('subunit treats "unexpectedSuccess"'
 
2181
                           ' as a plain success',
 
2182
            self.assertEqual, 1, len(result.unexpectedSuccesses))
2205
2183
        self.assertEqual(1, len(result.unexpectedSuccesses))
2206
2184
        test = result.unexpectedSuccesses[0]
2207
2185
        # RemotedTestCase doesn't preserve the "details"