diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2012-04-07 13:51:20 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2012-04-07 13:51:20 -0400 |
| commit | 2d43eef466ba091d132cd3da740770c686d19444 (patch) | |
| tree | ab5846e9002c7799e61721bc1aeca7ef0ff4503e | |
| parent | ed8d0afca6d513359e16b9e9acf409dd430b50de (diff) | |
| download | external_python_setuptools-2d43eef466ba091d132cd3da740770c686d19444.tar.gz external_python_setuptools-2d43eef466ba091d132cd3da740770c686d19444.tar.bz2 external_python_setuptools-2d43eef466ba091d132cd3da740770c686d19444.zip | |
Make sure to un-monkey-patch the Distribution class when running test_no_setup_cfg. Otherwise, it breaks other tests (notably the new test_setup_requires_honors_fetch_params).
--HG--
branch : distribute
extra : rebase_source : f54d67ea495c18ff1dc74d12ff96797e64abe5e1
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index c5fb4d9d..d89c8ae3 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -103,7 +103,7 @@ class TestEasyInstallTest(unittest.TestCase): opts = self.command_options if 'easy_install' in opts: assert 'find_links' not in opts['easy_install'], msg - return self._old_parse_command_line + return self._old_parse_command_line() Distribution._old_parse_command_line = Distribution.parse_command_line Distribution.parse_command_line = _parse_command_line @@ -115,6 +115,7 @@ class TestEasyInstallTest(unittest.TestCase): finally: os.chdir(old_wd) shutil.rmtree(dir) + Distribution.parse_command_line = Distribution._old_parse_command_line def test_no_find_links(self): # new option '--no-find-links', that blocks find-links added at |