Merged revisions 72539 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72539 | tarek.ziade | 2009-05-10 13:59:30 +0200 (Sun, 10 May 2009) | 1 line
refactored test_sysconfig so it uses test.test_support.EnvironmentVarGuard
........
diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index ab2af9a..cdcbc37 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -5,6 +5,7 @@
from distutils import log
from distutils.core import Distribution
+from test.support import EnvironmentVarGuard
class LoggingSilencer(object):
@@ -82,3 +83,13 @@
def ensure_finalized(self):
pass
+
+class EnvironGuard(object):
+
+ def setUp(self):
+ super(EnvironGuard, self).setUp()
+ self.environ = EnvironmentVarGuard()
+
+ def tearDown(self):
+ self.environ.__exit__()
+ super(EnvironGuard, self).tearDown()
diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
index f65bc72..322df39 100644
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@ -1,25 +1,14 @@
-"""Tests for distutils.dist."""
-
-from distutils import sysconfig
-from distutils.ccompiler import get_default_compiler
-
+"""Tests for distutils.sysconfig."""
import os
import unittest
+from distutils import sysconfig
+from distutils.ccompiler import get_default_compiler
+from distutils.tests import support
from test.support import TESTFN
-class SysconfigTestCase(unittest.TestCase):
-
- def setUp(self):
- self.old_flags = [('AR', os.environ.get('AR')),
- ('ARFLAGS', os.environ.get('ARFLAGS'))]
-
- def tearDown(self):
- for name, value in self.old_flags:
- if value is not None:
- os.environ[name] = value
- elif name in os.environ:
- del os.environ[name]
+class SysconfigTestCase(support.EnvironGuard,
+ unittest.TestCase):
def test_get_config_h_filename(self):
config_h = sysconfig.get_config_h_filename()
@@ -53,8 +42,8 @@
if get_default_compiler() != 'unix':
return
- os.environ['AR'] = 'my_ar'
- os.environ['ARFLAGS'] = '-arflags'
+ self.environ['AR'] = 'my_ar'
+ self.environ['ARFLAGS'] = '-arflags'
# make sure AR gets caught
class compiler: