@@ -61,6 +61,17 @@ def testPass(self):
61
61
pass
62
62
def testFail (self ):
63
63
raise AssertionError
64
+ def testError (self ):
65
+ 1 / 0
66
+ @unittest .skip ('skipping' )
67
+ def testSkipped (self ):
68
+ raise AssertionError
69
+ @unittest .expectedFailure
70
+ def testExpectedFailure (self ):
71
+ raise AssertionError
72
+ @unittest .expectedFailure
73
+ def testUnexpectedSuccess (self ):
74
+ pass
64
75
65
76
class FooBarLoader (unittest .TestLoader ):
66
77
"""Test loader that returns a suite containing FooBar."""
@@ -111,9 +122,13 @@ def test_NonExit(self):
111
122
testRunner = unittest .TextTestRunner (stream = stream ),
112
123
testLoader = self .FooBarLoader ())
113
124
self .assertTrue (hasattr (program , 'result' ))
114
- self .assertIn ('\n FAIL: testFail ' , stream .getvalue ())
115
- self .assertTrue (stream .getvalue ().endswith ('\n \n FAILED (failures=1)\n ' ))
116
-
125
+ out = stream .getvalue ()
126
+ self .assertIn ('\n FAIL: testFail ' , out )
127
+ self .assertIn ('\n ERROR: testError ' , out )
128
+ self .assertIn ('\n UNEXPECTED SUCCESS: testUnexpectedSuccess ' , out )
129
+ expected = ('\n \n FAILED (failures=1, errors=1, skipped=1, '
130
+ 'expected failures=1, unexpected successes=1)\n ' )
131
+ self .assertTrue (out .endswith (expected ))
117
132
118
133
def test_Exit (self ):
119
134
stream = BufferedWriter ()
@@ -124,9 +139,13 @@ def test_Exit(self):
124
139
testRunner = unittest .TextTestRunner (stream = stream ),
125
140
exit = True ,
126
141
testLoader = self .FooBarLoader ())
127
- self .assertIn ('\n FAIL: testFail ' , stream .getvalue ())
128
- self .assertTrue (stream .getvalue ().endswith ('\n \n FAILED (failures=1)\n ' ))
129
-
142
+ out = stream .getvalue ()
143
+ self .assertIn ('\n FAIL: testFail ' , out )
144
+ self .assertIn ('\n ERROR: testError ' , out )
145
+ self .assertIn ('\n UNEXPECTED SUCCESS: testUnexpectedSuccess ' , out )
146
+ expected = ('\n \n FAILED (failures=1, errors=1, skipped=1, '
147
+ 'expected failures=1, unexpected successes=1)\n ' )
148
+ self .assertTrue (out .endswith (expected ))
130
149
131
150
def test_ExitAsDefault (self ):
132
151
stream = BufferedWriter ()
@@ -136,8 +155,13 @@ def test_ExitAsDefault(self):
136
155
argv = ["foobar" ],
137
156
testRunner = unittest .TextTestRunner (stream = stream ),
138
157
testLoader = self .FooBarLoader ())
139
- self .assertIn ('\n FAIL: testFail ' , stream .getvalue ())
140
- self .assertTrue (stream .getvalue ().endswith ('\n \n FAILED (failures=1)\n ' ))
158
+ out = stream .getvalue ()
159
+ self .assertIn ('\n FAIL: testFail ' , out )
160
+ self .assertIn ('\n ERROR: testError ' , out )
161
+ self .assertIn ('\n UNEXPECTED SUCCESS: testUnexpectedSuccess ' , out )
162
+ expected = ('\n \n FAILED (failures=1, errors=1, skipped=1, '
163
+ 'expected failures=1, unexpected successes=1)\n ' )
164
+ self .assertTrue (out .endswith (expected ))
141
165
142
166
143
167
class InitialisableProgram (unittest .TestProgram ):
0 commit comments