Skip to content

bpo-30664: The description of a unittest subtest now preserves the #2265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 3 commits into from
Jun 23, 2017
Merged

bpo-30664: The description of a unittest subtest now preserves the #2265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea57a1d
bpo-30664: The description of a unittest subtest now preserves the
serhiy-storchaka Jun 18, 2017
b0b3159
Merge branch 'master' into unittest-subtest-kwargs-order
serhiy-storchaka Jun 23, 2017
c916068
Update Misc/NEWS.
serhiy-storchaka Jun 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Lib/unittest/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,16 @@ def __exit__(self, exc_type, exc_value, tb):
.format(logging.getLevelName(self.level), self.logger.name))


class _OrderedChainMap(collections.ChainMap):
def __iter__(self):
seen = set()
for mapping in self.maps:
for k in mapping:
if k not in seen:
seen.add(k)
yield k


class TestCase(object):
"""A class whose instances are single test cases.

Expand Down Expand Up @@ -514,7 +524,7 @@ def subTest(self, msg=_subtest_msg_sentinel, **params):
return
parent = self._subtest
if parent is None:
params_map = collections.ChainMap(params)
params_map = _OrderedChainMap(params)
else:
params_map = parent.params.new_child(params)
self._subtest = _SubTest(self, msg, params_map)
Expand Down Expand Up @@ -1418,7 +1428,7 @@ def _subDescription(self):
if self.params:
params_desc = ', '.join(
"{}={!r}".format(k, v)
for (k, v) in sorted(self.params.items()))
for (k, v) in self.params.items())
parts.append("({})".format(params_desc))
return " ".join(parts) or '(<subtest>)'

Expand Down
19 changes: 14 additions & 5 deletions Lib/unittest/test/test_result.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ def testGetSubTestDescriptionWithoutDocstring(self):
self.assertEqual(
result.getDescription(self._subtest),
'testGetSubTestDescriptionWithoutDocstring (' + __name__ +
'.Test_TestResult) (bar=2, foo=1)')
'.Test_TestResult) (foo=1, bar=2)')
with self.subTest('some message'):
result = unittest.TextTestResult(None, True, 1)
self.assertEqual(
Expand Down Expand Up @@ -335,12 +335,21 @@ def testGetSubTestDescriptionForFalsyValues(self):

def testGetNestedSubTestDescriptionWithoutDocstring(self):
with self.subTest(foo=1):
with self.subTest(bar=2):
with self.subTest(baz=2, bar=3):
result = unittest.TextTestResult(None, True, 1)
self.assertEqual(
result.getDescription(self._subtest),
'testGetNestedSubTestDescriptionWithoutDocstring '
'(' + __name__ + '.Test_TestResult) (bar=2, foo=1)')
'(' + __name__ + '.Test_TestResult) (baz=2, bar=3, foo=1)')

def testGetDuplicatedNestedSubTestDescriptionWithoutDocstring(self):
with self.subTest(foo=1, bar=2):
with self.subTest(baz=3, bar=4):
result = unittest.TextTestResult(None, True, 1)
self.assertEqual(
result.getDescription(self._subtest),
'testGetDuplicatedNestedSubTestDescriptionWithoutDocstring '
'(' + __name__ + '.Test_TestResult) (baz=3, bar=4, foo=1)')

@unittest.skipIf(sys.flags.optimize >= 2,
"Docstrings are omitted with -O2 and above")
Expand All @@ -362,7 +371,7 @@ def testGetSubTestDescriptionWithOneLineDocstring(self):
self.assertEqual(
result.getDescription(self._subtest),
('testGetSubTestDescriptionWithOneLineDocstring '
'(' + __name__ + '.Test_TestResult) (bar=2, foo=1)\n'
'(' + __name__ + '.Test_TestResult) (foo=1, bar=2)\n'
'Tests getDescription() for a method with a docstring.'))

@unittest.skipIf(sys.flags.optimize >= 2,
Expand Down Expand Up @@ -390,7 +399,7 @@ def testGetSubTestDescriptionWithMultiLineDocstring(self):
self.assertEqual(
result.getDescription(self._subtest),
('testGetSubTestDescriptionWithMultiLineDocstring '
'(' + __name__ + '.Test_TestResult) (bar=2, foo=1)\n'
'(' + __name__ + '.Test_TestResult) (foo=1, bar=2)\n'
'Tests getDescription() for a method with a longer '
'docstring.'))

Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,9 @@ Extension Modules
Library
-------

- bpo-30664: The description of a unittest subtest now preserves the order of
keyword arguments of TestCase.subTest().

- [Security] bpo-30730: Prevent environment variables injection in subprocess on
Windows. Prevent passing other environment variables and command arguments.

Expand Down