From 0f31e6db36b19fecb403f7eb75d136aad9186e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= Date: Wed, 25 Feb 2009 22:31:38 +0000 Subject: Merged revisions 69976 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r69976 | tarek.ziade | 2009-02-25 23:29:27 +0100 (Wed, 25 Feb 2009) | 1 line Fixed #5316 : test failure in test_site ........ --- Lib/distutils/tests/test_config.py | 4 ++-- Lib/distutils/tests/test_sdist.py | 6 ++---- Misc/NEWS | 2 ++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py index 0df6af8..09abfcd 100644 --- a/Lib/distutils/tests/test_config.py +++ b/Lib/distutils/tests/test_config.py @@ -50,7 +50,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase): def setUp(self): """Patches the environment.""" - support.TempdirManager.setUp(self) + super(PyPIRCCommandTestCase, self).setUp() if 'HOME' in os.environ: self._old_home = os.environ['HOME'] @@ -78,7 +78,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase): else: os.environ['HOME'] = self._old_home set_threshold(self.old_threshold) - support.TempdirManager.tearDown(self) + super(PyPIRCCommandTestCase, self).tearDown() def test_server_registration(self): # This test makes sure PyPIRCCommand knows how to: diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py index 9c579b4..15a8c80 100644 --- a/Lib/distutils/tests/test_sdist.py +++ b/Lib/distutils/tests/test_sdist.py @@ -37,10 +37,9 @@ somecode%(sep)sdoc.txt class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase): def setUp(self): - support.LoggingSilencer.setUp(self) # PyPIRCCommandTestCase creates a temp dir already # and put it in self.tmp_dir - PyPIRCCommandTestCase.setUp(self) + super(sdistTestCase, self).setUp() # setting up an environment self.old_path = os.getcwd() os.mkdir(join(self.tmp_dir, 'somecode')) @@ -54,8 +53,7 @@ class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase): def tearDown(self): # back to normal os.chdir(self.old_path) - PyPIRCCommandTestCase.tearDown(self) - support.LoggingSilencer.tearDown(self) + super(sdistTestCase, self).tearDown() def get_cmd(self, metadata=None): """Returns a cmd""" diff --git a/Misc/NEWS b/Misc/NEWS index 09af442..15c0699 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -172,6 +172,8 @@ Core and Builtins Library ------- +- Issue #5316: Fixed buildbot failures introduced by multiple inheritance + in Distutils tests. - Issue #5287: Add exception handling around findCaller() call to help out IronPython. -- cgit v0.12