From e3bc0eff256e5eda47a4190171db65ad5b9102db Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tarek=20Ziad=C3=A9?= Date: Wed, 25 Feb 2009 22:29:27 +0000 Subject: [PATCH] Fixed #5316 : test failure in test_site --- Lib/distutils/tests/test_config.py | 4 ++-- Lib/distutils/tests/test_sdist.py | 6 ++---- Misc/NEWS | 3 +++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py index d81276928a..a18f45359a 100644 --- a/Lib/distutils/tests/test_config.py +++ b/Lib/distutils/tests/test_config.py @@ -51,7 +51,7 @@ class PyPIRCCommandTestCase(support.TempdirManager, unittest.TestCase): def setUp(self): """Patches the environment.""" - support.TempdirManager.setUp(self) + super(PyPIRCCommandTestCase, self).setUp() if os.environ.has_key('HOME'): self._old_home = os.environ['HOME'] @@ -79,7 +79,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 9c579b40cb..15a8c8087c 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 778720302c..77fa4931f4 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -165,6 +165,9 @@ 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. -- 2.50.1