summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_sundry.py
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-04-02 18:52:12 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-04-02 18:52:12 (GMT)
commit41fe6155394edf0ef65d125b27ceb8d1e37f72d3 (patch)
tree68af315f367bba93ba4d7d370e755bccd79c047f /Lib/test/test_sundry.py
parent1bfd0cc5d40018a6dd9f279d6d7acb829c76cc8f (diff)
downloadcpython-41fe6155394edf0ef65d125b27ceb8d1e37f72d3.zip
cpython-41fe6155394edf0ef65d125b27ceb8d1e37f72d3.tar.gz
cpython-41fe6155394edf0ef65d125b27ceb8d1e37f72d3.tar.bz2
(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. ........
Diffstat (limited to 'Lib/test/test_sundry.py')
-rw-r--r--Lib/test/test_sundry.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py
index ee387c7..365b98b 100644
--- a/Lib/test/test_sundry.py
+++ b/Lib/test/test_sundry.py
@@ -3,12 +3,10 @@
from test import support
import sys
import unittest
-import warnings
class TestUntestedModules(unittest.TestCase):
def test_at_least_import_untested_modules(self):
- with warnings.catch_warnings():
- warnings.simplefilter("ignore")
+ with support.check_warnings(quiet=True):
import bdb
import cgitb
import code