Commit e1177d9d authored by Tarek Ziade's avatar Tarek Ziade

Issue #12125: fixed the failures under Solaris due to improper test cleanup.

parent fabc3083
...@@ -31,11 +31,11 @@ class CreateTestCase(support.TempdirManager, ...@@ -31,11 +31,11 @@ class CreateTestCase(support.TempdirManager,
'doc': sys.prefix + '/share/doc/pyxfoil', } 'doc': sys.prefix + '/share/doc/pyxfoil', }
def tearDown(self): def tearDown(self):
super(CreateTestCase, self).tearDown()
sys.stdin = self._stdin sys.stdin = self._stdin
sys.stdout = self._stdout sys.stdout = self._stdout
os.chdir(self._cwd) os.chdir(self._cwd)
sysconfig.get_paths = self._old_get_paths sysconfig.get_paths = self._old_get_paths
super(CreateTestCase, self).tearDown()
def test_ask_yn(self): def test_ask_yn(self):
sys.stdin.write('y\n') sys.stdin.write('y\n')
......
...@@ -26,6 +26,14 @@ class ManifestTestCase(support.TempdirManager, ...@@ -26,6 +26,14 @@ class ManifestTestCase(support.TempdirManager,
support.LoggingCatcher, support.LoggingCatcher,
unittest.TestCase): 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): def test_manifest_reader(self):
tmpdir = self.mkdtemp() tmpdir = self.mkdtemp()
MANIFEST = os.path.join(tmpdir, 'MANIFEST.in') MANIFEST = os.path.join(tmpdir, 'MANIFEST.in')
......
...@@ -36,8 +36,13 @@ class UninstallTestCase(support.TempdirManager, ...@@ -36,8 +36,13 @@ class UninstallTestCase(support.TempdirManager,
self.addCleanup(os.chdir, os.getcwd()) self.addCleanup(os.chdir, os.getcwd())
self.addCleanup(enable_cache) self.addCleanup(enable_cache)
self.root_dir = self.mkdtemp() self.root_dir = self.mkdtemp()
self.cwd = os.getcwd()
disable_cache() disable_cache()
def tearDown(self):
os.chdir(self.cwd)
super(UninstallTestCase, self).tearDown()
def run_setup(self, *args): def run_setup(self, *args):
# run setup with args # run setup with args
args = ['run'] + list(args) args = ['run'] + list(args)
......
...@@ -153,6 +153,8 @@ Core and Builtins ...@@ -153,6 +153,8 @@ Core and Builtins
Library 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 - Issue #6501: os.device_encoding() returns None on Windows if the application
has no console. has no console.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment