aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-02-20 11:50:28 -0600
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-02-20 11:50:28 -0600
commit9543e4e2dbe09ef9af20fe38ce80daf4eb8d2664 (patch)
tree2c965d42fd14130a6ef4c83ce02a30251311da33
parent8be38b39270d4545bb303eb08fa5e84940de04a2 (diff)
parent8a58e6997b8b4abfed11a8a23b539e261fde1a28 (diff)
downloadcryptography-9543e4e2dbe09ef9af20fe38ce80daf4eb8d2664.tar.gz
cryptography-9543e4e2dbe09ef9af20fe38ce80daf4eb8d2664.tar.bz2
cryptography-9543e4e2dbe09ef9af20fe38ce80daf4eb8d2664.zip
Merge pull request #1683 from alex/only-run-local-tests
Tell py.test to only run the tests from the local tests dir.
-rw-r--r--setup.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 32a87ba3..2324d54f 100644
--- a/setup.py
+++ b/setup.py
@@ -135,7 +135,8 @@ class PyTest(test):
def run_tests(self):
# Import here because in module scope the eggs are not loaded.
import pytest
- errno = pytest.main(self.test_args)
+ test_args = [os.path.join(base_dir, "tests")]
+ errno = pytest.main(test_args)
sys.exit(errno)