diff options
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-05-29 09:14:04 +0000 |
|---|---|---|
| committer | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> | 2009-05-29 09:14:04 +0000 |
| commit | f9b04c5e43bf858c654b1557447ed19051bd85a4 (patch) | |
| tree | a40789509888040cc84e612db125bdfcdf496f19 | |
| parent | 3418332f7bce309b6d404bd8e1a9775ea180e93f (diff) | |
| download | python-setuptools-git-f9b04c5e43bf858c654b1557447ed19051bd85a4.tar.gz | |
Merged revisions 73008 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73008 | tarek.ziade | 2009-05-29 17:08:07 +0900 | 1 line
Fixed #6131: test_modulefinder leaked when run after test_distutils
........
| -rw-r--r-- | tests/test_bdist_dumb.py | 6 | ||||
| -rw-r--r-- | tests/test_dir_util.py | 4 | ||||
| -rw-r--r-- | tests/test_file_util.py | 4 | ||||
| -rw-r--r-- | tests/test_register.py | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/tests/test_bdist_dumb.py b/tests/test_bdist_dumb.py index 2863b620..d2ea201b 100644 --- a/tests/test_bdist_dumb.py +++ b/tests/test_bdist_dumb.py @@ -22,16 +22,14 @@ class BuildDumbTestCase(support.TempdirManager, unittest.TestCase): def setUp(self): - support.TempdirManager.setUp(self) - support.LoggingSilencer.setUp(self) + super(BuildDumbTestCase, self).setUp() self.old_location = os.getcwd() self.old_sys_argv = sys.argv[:] def tearDown(self): os.chdir(self.old_location) sys.argv = self.old_sys_argv[:] - support.LoggingSilencer.tearDown(self) - support.TempdirManager.tearDown(self) + super(BuildDumbTestCase, self).tearDown() def test_simple_built(self): diff --git a/tests/test_dir_util.py b/tests/test_dir_util.py index 6b22f05f..0f694aa0 100644 --- a/tests/test_dir_util.py +++ b/tests/test_dir_util.py @@ -18,7 +18,7 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase): self._logs.append(msg) def setUp(self): - support.TempdirManager.setUp(self) + super(DirUtilTestCase, self).setUp() self._logs = [] tmp_dir = self.mkdtemp() self.root_target = os.path.join(tmp_dir, 'deep') @@ -29,7 +29,7 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase): def tearDown(self): log.info = self.old_log - support.TempdirManager.tearDown(self) + super(DirUtilTestCase, self).tearDown() def test_mkpath_remove_tree_verbosity(self): diff --git a/tests/test_file_util.py b/tests/test_file_util.py index 9373af85..fac4a5d1 100644 --- a/tests/test_file_util.py +++ b/tests/test_file_util.py @@ -16,7 +16,7 @@ class FileUtilTestCase(support.TempdirManager, unittest.TestCase): self._logs.append(msg) def setUp(self): - support.TempdirManager.setUp(self) + super(FileUtilTestCase, self).setUp() self._logs = [] self.old_log = log.info log.info = self._log @@ -27,7 +27,7 @@ class FileUtilTestCase(support.TempdirManager, unittest.TestCase): def tearDown(self): log.info = self.old_log - support.TempdirManager.tearDown(self) + super(FileUtilTestCase, self).tearDown() def test_move_file_verbosity(self): f = open(self.source, 'w') diff --git a/tests/test_register.py b/tests/test_register.py index f486cf79..d9ff3ec4 100644 --- a/tests/test_register.py +++ b/tests/test_register.py @@ -66,7 +66,7 @@ class FakeOpener(object): class RegisterTestCase(PyPIRCCommandTestCase): def setUp(self): - PyPIRCCommandTestCase.setUp(self) + super(RegisterTestCase, self).setUp() # patching the password prompt self._old_getpass = getpass.getpass def _getpass(prompt): @@ -78,7 +78,7 @@ class RegisterTestCase(PyPIRCCommandTestCase): def tearDown(self): getpass.getpass = self._old_getpass urllib.request.build_opener = self.old_opener - PyPIRCCommandTestCase.tearDown(self) + super(RegisterTestCase, self).tearDown() def _get_cmd(self, metadata=None): if metadata is None: |