aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_easy_install.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-06-19 15:25:42 -0500
committerJason R. Coombs <jaraco@jaraco.com>2013-06-19 15:25:42 -0500
commit8c893ea506739395f28b26acd45a951983bc8aa4 (patch)
tree884910f3333286aceb045f96b325792eff97e917 /setuptools/tests/test_easy_install.py
parent1f98cb2880de5d716933ada52604044cbe5b3cbc (diff)
parent54cea58c9eb477f8d53c44a6555dbc1f7531fbb8 (diff)
downloadexternal_python_setuptools-8c893ea506739395f28b26acd45a951983bc8aa4.tar.gz
external_python_setuptools-8c893ea506739395f28b26acd45a951983bc8aa4.tar.bz2
external_python_setuptools-8c893ea506739395f28b26acd45a951983bc8aa4.zip
Merge fix for #21
Diffstat (limited to 'setuptools/tests/test_easy_install.py')
-rw-r--r--setuptools/tests/test_easy_install.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index b0609eb1..2732bb3e 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -272,11 +272,12 @@ class TestUserInstallTest(unittest.TestCase):
sys.stdout = StringIO()
sys.stderr = StringIO()
try:
- reset_setup_stop_context(
- lambda: run_setup(test_setup_py, ['install'])
- )
- except SandboxViolation:
- self.fail('Installation caused SandboxViolation')
+ try:
+ reset_setup_stop_context(
+ lambda: run_setup(test_setup_py, ['install'])
+ )
+ except SandboxViolation:
+ self.fail('Installation caused SandboxViolation')
finally:
sys.stdout = old_stdout
sys.stderr = old_stderr