summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2014-01-11 07:50:18 -0500
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2014-01-11 07:50:18 -0500
commit2b1e0bd1965f859783ac9cf2c5752b971900ecdd (patch)
treead3aa046f9e25d45baf261639b9c143756abd0fc
parent6cdff717db007ee9314a7aba780d6f0bd91bb707 (diff)
downloadpyopenssl-2b1e0bd1965f859783ac9cf2c5752b971900ecdd.tar.gz
Switch to using the now-working `setup.py test´.
-rw-r--r--tox.ini13
1 files changed, 2 insertions, 11 deletions
diff --git a/tox.ini b/tox.ini
index d1e6170..67386d1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,19 +1,10 @@
[tox]
-envlist = py26,py27,pypy,py32,py33
+envlist = pypy,py26,py27,py32,py33
[testenv]
setenv =
# Do not allowed the executing environment to pollute the test environment
# with extra packages.
PYTHONPATH=
-
# The standard library unittest module can run tests on Python 2.7 and newer
-commands = python -m unittest -v OpenSSL.test.test_rand OpenSSL.test.test_crypto OpenSSL.test.test_ssl
-
-[testenv:py26]
-deps =
- # Twisted doesn't declare this dependency so we have to do it
- zope.interface
- twisted
-# On Python 2.6 use a different test runner
-commands = trial OpenSSL
+commands = python setup.py test