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

This commit is contained in:
Tarek Ziade 2011-05-23 19:07:56 +02:00
parent fabc30833f
commit e1177d9d17
4 changed files with 16 additions and 1 deletions

View File

@ -31,11 +31,11 @@ class CreateTestCase(support.TempdirManager,
'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')

View File

@ -26,6 +26,14 @@ class ManifestTestCase(support.TempdirManager,
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')

View File

@ -36,8 +36,13 @@ class UninstallTestCase(support.TempdirManager,
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)

View File

@ -153,6 +153,8 @@ Core and Builtins
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.