Skip to content

[3.10] bpo-44295: ensure deprecation warning from assertDictContainsSubset points at actual test code #26497

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
rhettinger merged 1 commit into from
Nov 16, 2021
Merged

[3.10] bpo-44295: ensure deprecation warning from assertDictContainsSubset points at actual test code #26497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Lib/unittest/case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,8 @@ def assertDictEqual(self, d1, d2, msg=None):
def assertDictContainsSubset(self, subset, dictionary, msg=None):
"""Checks whether dictionary is a superset of subset."""
warnings.warn('assertDictContainsSubset is deprecated',
Comment thread
asottile marked this conversation as resolved.
Outdated
DeprecationWarning)
DeprecationWarning,
stacklevel=2)
missing = []
mismatched = []
for key, value in subset.items():
Expand Down
4 changes: 4 additions & 0 deletions Lib/unittest/test/test_case.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,10 @@ def testAssertDictContainsSubset(self):
with self.assertRaises(self.failureException):
self.assertDictContainsSubset({'foo': one}, {'foo': '\uFFFD'})

with self.assertWarns(DeprecationWarning) as warninfo:
self.assertDictContainsSubset({}, {})
self.assertEqual(warninfo.warnings[0].filename, __file__)

def testAssertEqual(self):
equal_pairs = [
((), ()),
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2021-06-02-16-39-42.bpo-44295.erg01m.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Ensure deprecation warning from :func:`assertDictContainsSubset` points at
calling code - by Anthony Sottile.