diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-17 20:29:51 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-17 20:29:51 (GMT) |
| commit | 8fbddf15ea8ae342eee643cb5354d18cddc86dea (patch) | |
| tree | 1e2ebd338172cfbd62e922953f0674294cba1081 /Lib/test/test_shutil.py | |
| parent | a85c3bd17d9782b1e8d83a7b7cf350863897df5b (diff) | |
| download | cpython-8fbddf15ea8ae342eee643cb5354d18cddc86dea.zip cpython-8fbddf15ea8ae342eee643cb5354d18cddc86dea.tar.gz cpython-8fbddf15ea8ae342eee643cb5354d18cddc86dea.tar.bz2 | |
Merged revisions 79030-79032 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79030 | florent.xicluna | 2010-03-17 20:05:04 +0100 (mer, 17 mar 2010) | 2 lines
Cleanup in test_import and test_coding.
........
r79031 | florent.xicluna | 2010-03-17 20:15:56 +0100 (mer, 17 mar 2010) | 2 lines
Cleanup some test cases using check_warnings and check_py3k_warnings.
........
r79032 | florent.xicluna | 2010-03-17 21:05:11 +0100 (mer, 17 mar 2010) | 2 lines
Fix and check cgi module deprecation warnings. Revert an unwanted rename in test_import.
........
Diffstat (limited to 'Lib/test/test_shutil.py')
| -rw-r--r-- | Lib/test/test_shutil.py | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index f2e5d9b..3faa95e 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -464,30 +464,26 @@ class TestShutil(unittest.TestCase): old_dir = os.getcwd() os.chdir(tmpdir) try: - with captured_stdout() as s: - with check_warnings() as w: - warnings.simplefilter("always") - _make_tarball(base_name, 'dist', compress='compress') + with captured_stdout() as s, check_warnings(quiet=False) as w: + _make_tarball(base_name, 'dist', compress='compress') finally: os.chdir(old_dir) tarball = base_name + '.tar.Z' self.assertTrue(os.path.exists(tarball)) - self.assertEquals(len(w.warnings), 1) + self.assertEqual(len(w.warnings), 1) # same test with dry_run os.remove(tarball) old_dir = os.getcwd() os.chdir(tmpdir) try: - with captured_stdout() as s: - with check_warnings() as w: - warnings.simplefilter("always") - _make_tarball(base_name, 'dist', compress='compress', - dry_run=True) + with captured_stdout() as s, check_warnings(quiet=False) as w: + _make_tarball(base_name, 'dist', compress='compress', + dry_run=True) finally: os.chdir(old_dir) - self.assertTrue(not os.path.exists(tarball)) - self.assertEquals(len(w.warnings), 1) + self.assertFalse(os.path.exists(tarball)) + self.assertEqual(len(w.warnings), 1) @unittest.skipUnless(zlib, "Requires zlib") @unittest.skipUnless(ZIP_SUPPORT, 'Need zip support to run') |