diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-30 10:25:49 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-30 10:25:49 -0500 |
| commit | bf03c647971da1e3c5b69626fecf7f7be2830043 (patch) | |
| tree | 676d916b48d22d046696b1103df0ac9ca9ec8e34 | |
| parent | ef6b79453e26811eb387a8252834bf1f990f2a8d (diff) | |
| download | external_python_setuptools-bf03c647971da1e3c5b69626fecf7f7be2830043.tar.gz external_python_setuptools-bf03c647971da1e3c5b69626fecf7f7be2830043.tar.bz2 external_python_setuptools-bf03c647971da1e3c5b69626fecf7f7be2830043.zip | |
reset_setup_stop_context is apparently no longer needed.
| -rw-r--r-- | setuptools/tests/test_easy_install.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py index 4ee5adbe..dd1655d3 100644 --- a/setuptools/tests/test_easy_install.py +++ b/setuptools/tests/test_easy_install.py @@ -245,7 +245,6 @@ class TestUserInstallTest(unittest.TestCase): try: with quiet_context(): - with reset_setup_stop_context(): run_setup(test_setup_py, ['install']) except SandboxViolation: self.fail('Installation caused SandboxViolation') @@ -281,8 +280,7 @@ class TestSetupRequires(unittest.TestCase): '--allow-hosts', p_index_loc, '--exclude-scripts', '--install-dir', temp_install_dir, dist_file] - with reset_setup_stop_context(): - with argv_context(['easy_install']): + with argv_context(['easy_install']): # attempt to install the dist. It should fail because # it doesn't exist. with pytest.raises(SystemExit): @@ -331,7 +329,6 @@ class TestSetupRequires(unittest.TestCase): test_pkg = create_setup_requires_package(temp_dir) test_setup_py = os.path.join(test_pkg, 'setup.py') with quiet_context() as (stdout, stderr): - with reset_setup_stop_context(): try: # Don't even need to install the package, just # running the setup.py at all is sufficient @@ -438,6 +435,8 @@ def reset_setup_stop_context(): in distutils.core so that the setup() command will run naturally. """ saved = distutils.core._setup_stop_after + if saved is None: + raise ValueError("Not Needed") distutils.core._setup_stop_after = None yield distutils.core._setup_stop_after = saved |