summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorAlex Chan <alex@alexwlchan.net>2016-11-10 12:18:54 +0000
committerHynek Schlawack <hs@ox.cx>2016-11-10 13:18:54 +0100
commit9e08b3e83b98109454c25e5225ca6fecf73ebeec (patch)
treeb0ce862de52d65a92dfcae4c35c48b5a957849c2 /tox.ini
parentad8d5e8c92cbda2d60f9e33a52ebf5b20cfcfdf5 (diff)
downloadpyopenssl-git-9e08b3e83b98109454c25e5225ca6fecf73ebeec.tar.gz
Convert NextProtoNegotiationTests to use pytest-style tests (#569)
* Convert NextProtoNegotiationTests to use pytest-style tests Addresses #340. * Fix Twisted test suite See https://twistedmatrix.com/trac/ticket/8876 * Remove tests for OpenSSL with no NPN support NPN was added in OpenSSL 1.0.1. As of version 16.1.0, PyOpenSSL only supports OpenSSL 1.0.1 or later, so this test is: 1. Testing a use case that's no longer supported. 2. Dead code in CI.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 9a41630..964b88c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,7 @@ passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH LD_LIBRARY_PATH TERM
commands =
python -c "import OpenSSL.SSL; print(OpenSSL.SSL.SSLeay_version(OpenSSL.SSL.SSLEAY_VERSION))"
python -c "import cryptography; print(cryptography.__version__)"
- trial --reporter=text twisted
+ python -m twisted.trial
[testenv:py35-urllib3Master]
basepython=python3.5