Skip to content

Commit c7eb3de

Browse files
committed
unittest: Print module name on result lines.
Matches cpython format.
1 parent f92833b commit c7eb3de

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

python-stdlib/unittest/unittest.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,15 +212,16 @@ def test_exp_fail(*args, **kwargs):
212212

213213

214214
class TestSuite:
215-
def __init__(self):
215+
def __init__(self, name=""):
216216
self._tests = []
217+
self.name = name
217218

218219
def addTest(self, cls):
219220
self._tests.append(cls)
220221

221222
def run(self, result):
222223
for c in self._tests:
223-
run_suite(c, result)
224+
run_suite(c, result, self.name)
224225
return result
225226

226227

@@ -290,7 +291,7 @@ def capture_exc(e):
290291

291292

292293
# TODO: Uncompliant
293-
def run_suite(c, test_result):
294+
def run_suite(c, test_result, suite_name=""):
294295
if isinstance(c, TestSuite):
295296
c.run(test_result)
296297
return
@@ -302,9 +303,13 @@ def run_suite(c, test_result):
302303
set_up = getattr(o, "setUp", lambda: None)
303304
tear_down = getattr(o, "tearDown", lambda: None)
304305
exceptions = []
306+
try:
307+
suite_name += "." + c.__qualname__
308+
except AttributeError:
309+
pass
305310

306311
def run_one(m):
307-
print("%s (%s) ..." % (name, c.__qualname__), end="")
312+
print("%s (%s) ..." % (name, suite_name), end="")
308313
set_up()
309314
try:
310315
test_result.testsRun += 1
@@ -351,7 +356,7 @@ def test_cases(m):
351356
yield c
352357

353358
m = __import__(module) if isinstance(module, str) else module
354-
suite = TestSuite()
359+
suite = TestSuite(m.__name__)
355360
for c in test_cases(m):
356361
suite.addTest(c)
357362
runner = TestRunner()

0 commit comments

Comments
 (0)