@@ -212,15 +212,16 @@ def test_exp_fail(*args, **kwargs):
212
212
213
213
214
214
class TestSuite :
215
- def __init__ (self ):
215
+ def __init__ (self , name = "" ):
216
216
self ._tests = []
217
+ self .name = name
217
218
218
219
def addTest (self , cls ):
219
220
self ._tests .append (cls )
220
221
221
222
def run (self , result ):
222
223
for c in self ._tests :
223
- run_suite (c , result )
224
+ run_suite (c , result , self . name )
224
225
return result
225
226
226
227
@@ -290,7 +291,7 @@ def capture_exc(e):
290
291
291
292
292
293
# TODO: Uncompliant
293
- def run_suite (c , test_result ):
294
+ def run_suite (c , test_result , suite_name = "" ):
294
295
if isinstance (c , TestSuite ):
295
296
c .run (test_result )
296
297
return
@@ -302,9 +303,13 @@ def run_suite(c, test_result):
302
303
set_up = getattr (o , "setUp" , lambda : None )
303
304
tear_down = getattr (o , "tearDown" , lambda : None )
304
305
exceptions = []
306
+ try :
307
+ suite_name += "." + c .__qualname__
308
+ except AttributeError :
309
+ pass
305
310
306
311
def run_one (m ):
307
- print ("%s (%s) ..." % (name , c . __qualname__ ), end = "" )
312
+ print ("%s (%s) ..." % (name , suite_name ), end = "" )
308
313
set_up ()
309
314
try :
310
315
test_result .testsRun += 1
@@ -351,7 +356,7 @@ def test_cases(m):
351
356
yield c
352
357
353
358
m = __import__ (module ) if isinstance (module , str ) else module
354
- suite = TestSuite ()
359
+ suite = TestSuite (m . __name__ )
355
360
for c in test_cases (m ):
356
361
suite .addTest (c )
357
362
runner = TestRunner ()
0 commit comments