Issue #12125: fixed the failures under Solaris due to improper test cleanup.
diff --git a/Lib/packaging/tests/test_create.py b/Lib/packaging/tests/test_create.py
index 42cf34b..906ca8f 100644
--- a/Lib/packaging/tests/test_create.py
+++ b/Lib/packaging/tests/test_create.py
@@ -31,11 +31,11 @@
'doc': sys.prefix + '/share/doc/pyxfoil', }
def tearDown(self):
- super(CreateTestCase, self).tearDown()
sys.stdin = self._stdin
sys.stdout = self._stdout
os.chdir(self._cwd)
sysconfig.get_paths = self._old_get_paths
+ super(CreateTestCase, self).tearDown()
def test_ask_yn(self):
sys.stdin.write('y\n')
diff --git a/Lib/packaging/tests/test_manifest.py b/Lib/packaging/tests/test_manifest.py
index 21a42c3..9fb8b63 100644
--- a/Lib/packaging/tests/test_manifest.py
+++ b/Lib/packaging/tests/test_manifest.py
@@ -26,6 +26,14 @@
support.LoggingCatcher,
unittest.TestCase):
+ def setUp(self):
+ super(ManifestTestCase, self).setUp()
+ self.cwd = os.getcwd()
+
+ def tearDown(self):
+ os.chdir(self.cwd)
+ super(ManifestTestCase, self).tearDown()
+
def test_manifest_reader(self):
tmpdir = self.mkdtemp()
MANIFEST = os.path.join(tmpdir, 'MANIFEST.in')
diff --git a/Lib/packaging/tests/test_uninstall.py b/Lib/packaging/tests/test_uninstall.py
index 2d0e896..578b10d 100644
--- a/Lib/packaging/tests/test_uninstall.py
+++ b/Lib/packaging/tests/test_uninstall.py
@@ -36,8 +36,13 @@
self.addCleanup(os.chdir, os.getcwd())
self.addCleanup(enable_cache)
self.root_dir = self.mkdtemp()
+ self.cwd = os.getcwd()
disable_cache()
+ def tearDown(self):
+ os.chdir(self.cwd)
+ super(UninstallTestCase, self).tearDown()
+
def run_setup(self, *args):
# run setup with args
args = ['run'] + list(args)
diff --git a/Misc/NEWS b/Misc/NEWS
index 9e2c14d..01b95e2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -153,6 +153,8 @@
Library
-------
+- Issue #12125: fixed the failures under Solaris due to improper test cleanup.
+
- Issue #6501: os.device_encoding() returns None on Windows if the application
has no console.