mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
(partially)
Merged revisions 79534,79537,79539,79558,79606 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79534 | florent.xicluna | 2010-03-31 23:21:54 +0200 (mer, 31 mar 2010) | 2 lines Fix test for xml.etree when using a non-ascii path. And use check_warnings instead of catch_warnings. ........ r79537 | florent.xicluna | 2010-03-31 23:40:32 +0200 (mer, 31 mar 2010) | 2 lines Fix typo ........ r79539 | florent.xicluna | 2010-04-01 00:01:03 +0200 (jeu, 01 avr 2010) | 2 lines Replace catch_warnings with check_warnings when it makes sense. Use assertRaises context manager to simplify some tests. ........ r79558 | florent.xicluna | 2010-04-01 20:17:09 +0200 (jeu, 01 avr 2010) | 2 lines #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote. ........ r79606 | florent.xicluna | 2010-04-02 19:26:42 +0200 (ven, 02 avr 2010) | 2 lines Backport some robotparser test and skip the test if the external resource is not available. ........
This commit is contained in:
parent
1bfd0cc5d4
commit
41fe615539
14 changed files with 60 additions and 95 deletions
|
@ -213,19 +213,13 @@ class TestVectorsTestCase(unittest.TestCase):
|
|||
|
||||
with warnings.catch_warnings():
|
||||
warnings.simplefilter('error', RuntimeWarning)
|
||||
try:
|
||||
with self.assertRaises(RuntimeWarning):
|
||||
hmac.HMAC(b'a', b'b', digestmod=MockCrazyHash)
|
||||
except RuntimeWarning:
|
||||
pass
|
||||
else:
|
||||
self.fail('Expected warning about missing block_size')
|
||||
|
||||
MockCrazyHash.block_size = 1
|
||||
try:
|
||||
with self.assertRaises(RuntimeWarning):
|
||||
hmac.HMAC(b'a', b'b', digestmod=MockCrazyHash)
|
||||
except RuntimeWarning:
|
||||
pass
|
||||
else:
|
||||
self.fail('Expected warning about small block_size')
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue