Merge branch 'master' into better-allocator

pyca · Nov 28, 2016 · 5d64be3 · 5d64be3
2 parents bc215be + f189de9
commit 5d64be3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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__)"
-    python -m twisted.trial
+    python -m twisted.trial --reporter=text twisted
 
 [testenv:py35-urllib3Master]
 basepython=python3.5