aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-11-24 19:37:11 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-11-24 19:37:11 -0500
commit448cfc53cd16fb11562def2ee8b9bf66ed178b21 (patch)
treeae81f097686d7e42667e696f17218f02b4dd1368
parentbc7f3b0a36a1c676809f89eae7299afbb7f70f32 (diff)
downloadexternal_python_setuptools-448cfc53cd16fb11562def2ee8b9bf66ed178b21.tar.gz
external_python_setuptools-448cfc53cd16fb11562def2ee8b9bf66ed178b21.tar.bz2
external_python_setuptools-448cfc53cd16fb11562def2ee8b9bf66ed178b21.zip
Replace silent test acceptance with a proper skip check
-rw-r--r--setuptools/tests/test_develop.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/setuptools/tests/test_develop.py b/setuptools/tests/test_develop.py
index 96b9f4ef..2baf83bb 100644
--- a/setuptools/tests/test_develop.py
+++ b/setuptools/tests/test_develop.py
@@ -51,18 +51,9 @@ def test_env(tmpdir, temp_user):
class TestDevelopTest:
-
- def setup_method(self, method):
- if hasattr(sys, 'real_prefix'):
- return
-
- def teardown_method(self, method):
- if hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix):
- return
-
+ @pytest.mark.skipif(hasattr(sys, 'real_prefix'),
+ reason="Cannot run when invoked in a virtualenv")
def test_develop(self, test_env):
- if hasattr(sys, 'real_prefix'):
- return
dist = Distribution(
dict(name='foo',
packages=['foo'],