mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 10:19:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix test_unittest: ignore DeprecationWarning on assertDictContainsSubset()

Browse source
This commit is contained in:
Victor Stinner 2011-01-03 23:56:12 +00:00
parent 47f14bade8
commit cae969e70a
2 changed files with 30 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Lib/unittest/test/test_assertions.py
View file

@ -1,5 +1,5 @@
import datetime import datetime
import warnings
import unittest import unittest
@ -224,10 +224,13 @@ class TestLongMessage(unittest.TestCase):
"\+ \{'key': 'value'\} : oops$"]) "\+ \{'key': 'value'\} : oops$"])
def testAssertDictContainsSubset(self): def testAssertDictContainsSubset(self):
self.assertMessages('assertDictContainsSubset', ({'key': 'value'}, {}), with warnings.catch_warnings():
["^Missing: 'key'$", "^oops$", warnings.simplefilter("ignore", DeprecationWarning)
"^Missing: 'key'$",
"^Missing: 'key' : oops$"]) self.assertMessages('assertDictContainsSubset', ({'key': 'value'}, {}),
["^Missing: 'key'$", "^oops$",
"^Missing: 'key'$",
"^Missing: 'key' : oops$"])
def testAssertMultiLineEqual(self): def testAssertMultiLineEqual(self):
self.assertMessages('assertMultiLineEqual', ("", "foo"), self.assertMessages('assertMultiLineEqual', ("", "foo"),

41
Lib/unittest/test/test_case.py
View file

@ -489,31 +489,34 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing):
animals) animals)
def testAssertDictContainsSubset(self): def testAssertDictContainsSubset(self):
self.assertDictContainsSubset({}, {}) with warnings.catch_warnings():
self.assertDictContainsSubset({}, {'a': 1}) warnings.simplefilter("ignore", DeprecationWarning)
self.assertDictContainsSubset({'a': 1}, {'a': 1})
self.assertDictContainsSubset({'a': 1}, {'a': 1, 'b': 2})
self.assertDictContainsSubset({'a': 1, 'b': 2}, {'a': 1, 'b': 2})
with self.assertRaises(self.failureException): self.assertDictContainsSubset({}, {})
self.assertDictContainsSubset({1: "one"}, {}) self.assertDictContainsSubset({}, {'a': 1})
self.assertDictContainsSubset({'a': 1}, {'a': 1})
self.assertDictContainsSubset({'a': 1}, {'a': 1, 'b': 2})
self.assertDictContainsSubset({'a': 1, 'b': 2}, {'a': 1, 'b': 2})
with self.assertRaises(self.failureException): with self.assertRaises(self.failureException):
self.assertDictContainsSubset({'a': 2}, {'a': 1}) self.assertDictContainsSubset({1: "one"}, {})
with self.assertRaises(self.failureException): with self.assertRaises(self.failureException):
self.assertDictContainsSubset({'c': 1}, {'a': 1}) self.assertDictContainsSubset({'a': 2}, {'a': 1})
with self.assertRaises(self.failureException): with self.assertRaises(self.failureException):
self.assertDictContainsSubset({'a': 1, 'c': 1}, {'a': 1}) self.assertDictContainsSubset({'c': 1}, {'a': 1})
with self.assertRaises(self.failureException): with self.assertRaises(self.failureException):
self.assertDictContainsSubset({'a': 1, 'c': 1}, {'a': 1}) self.assertDictContainsSubset({'a': 1, 'c': 1}, {'a': 1})
one = ''.join(chr(i) for i in range(255)) with self.assertRaises(self.failureException):
# this used to cause a UnicodeDecodeError constructing the failure msg self.assertDictContainsSubset({'a': 1, 'c': 1}, {'a': 1})
with self.assertRaises(self.failureException):
self.assertDictContainsSubset({'foo': one}, {'foo': '\uFFFD'}) one = ''.join(chr(i) for i in range(255))
# this used to cause a UnicodeDecodeError constructing the failure msg
with self.assertRaises(self.failureException):
self.assertDictContainsSubset({'foo': one}, {'foo': '\uFFFD'})
def testAssertEqual(self): def testAssertEqual(self):
equal_pairs = [ equal_pairs = [