summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-11-12 17:47:38 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-11-12 17:47:38 (GMT)
commitd5c075143b9fc133b206229c6d86cd6a0c46364a (patch)
tree212e39282724a9eafa52365cb8fe83ded84dcb32 /Lib/distutils
parent30c49cb17fab6538c8b25ddb19c4f0ab04097eff (diff)
parent2f85555531c79184767d4954f20e310beda99421 (diff)
downloadcpython-d5c075143b9fc133b206229c6d86cd6a0c46364a.zip
cpython-d5c075143b9fc133b206229c6d86cd6a0c46364a.tar.gz
cpython-d5c075143b9fc133b206229c6d86cd6a0c46364a.tar.bz2
Issue #25607: Restore old distutils logging threshold after running tests that
parse command line arguments.
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/tests/test_core.py2
-rw-r--r--Lib/distutils/tests/test_dist.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/distutils/tests/test_core.py b/Lib/distutils/tests/test_core.py
index 57856f1..27ce732 100644
--- a/Lib/distutils/tests/test_core.py
+++ b/Lib/distutils/tests/test_core.py
@@ -9,6 +9,7 @@ import test.support
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__ = """\
@@ -51,6 +52,7 @@ class CoreTestCase(support.EnvironGuard, unittest.TestCase):
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
index b7fd3fb..1f104ce 100644
--- a/Lib/distutils/tests/test_dist.py
+++ b/Lib/distutils/tests/test_dist.py
@@ -13,6 +13,7 @@ from distutils.cmd import Command
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 @@ class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
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