[Python-checkins] cpython (3.4): Issue #25607: Restore old distutils logging threshold after running tests that

Thu Nov 12 12:48:30 EST 2015

https://hg.python.org/cpython/rev/4461613ffe78
changeset: 99084:4461613ffe78
branch: 3.4
parent: 99079:515ebfbb4e67
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Nov 12 19:46:23 2015 +0200
summary:
 Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.
files:
 Lib/distutils/tests/test_core.py | 2 ++
 Lib/distutils/tests/test_dist.py | 2 ++
 Lib/test/test_shutil.py | 2 +-
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Lib/distutils/tests/test_core.py b/Lib/distutils/tests/test_core.py
--- a/Lib/distutils/tests/test_core.py
+++ b/Lib/distutils/tests/test_core.py
@@ -9,6 +9,7 @@
 from test.support import captured_stdout, run_unittest
 import unittest
 from distutils.tests import support
+from distutils import log
 
 # setup script that uses __file__
 setup_using___file__ = """\
@@ -36,6 +37,7 @@
 self.old_stdout = sys.stdout
 self.cleanup_testfn()
 self.old_argv = sys.argv, sys.argv[:]
+ self.addCleanup(log.set_threshold, log._global_log.threshold)
 
 def tearDown(self):
 sys.stdout = self.old_stdout
diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py
--- a/Lib/distutils/tests/test_dist.py
+++ b/Lib/distutils/tests/test_dist.py
@@ -13,6 +13,7 @@
 
 from test.support import TESTFN, captured_stdout, run_unittest
 from distutils.tests import support
+from distutils import log
 
 
 class test_dist(Command):
@@ -405,6 +406,7 @@
 
 def test_show_help(self):
 # smoke test, just makes sure some help is displayed
+ self.addCleanup(log.set_threshold, log._global_log.threshold)
 dist = Distribution()
 sys.argv = []
 dist.help = 1
diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py
--- a/Lib/test/test_shutil.py
+++ b/Lib/test/test_shutil.py
@@ -1031,7 +1031,7 @@
 # now create another tarball using `tar`
 tarball2 = os.path.join(root_dir, 'archive2.tar')
 tar_cmd = ['tar', '-cf', 'archive2.tar', base_dir]
- with support.change_cwd(root_dir), captured_stdout():
+ with support.change_cwd(root_dir):
 spawn(tar_cmd)
 
 self.assertTrue(os.path.isfile(tarball2))
-- 
Repository URL: https://hg.python.org/cpython
