From 9e08b3e83b98109454c25e5225ca6fecf73ebeec Mon Sep 17 00:00:00 2001
From: Alex Chan <alex@alexwlchan.net>
Date: Thu, 10 Nov 2016 12:18:54 +0000
Subject: 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.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tox.ini')

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
-- 
cgit v1.2.1