summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Benfield <lukasaoz@gmail.com>2016-03-14 15:09:19 +0000
committerCory Benfield <lukasaoz@gmail.com>2016-03-14 16:06:16 +0000
commitd296b1b1f023fc09018d7a3093fe8f644221a0e9 (patch)
tree8b0e71a5866b82bcdbeedc03e6ee1f5090d8c7c3
parent581c4dac26b98e189d2a238cd64bb885c3549d6b (diff)
downloadpyopenssl-d296b1b1f023fc09018d7a3093fe8f644221a0e9.tar.gz
Smoke test for urllib3.
-rw-r--r--.travis.yml4
-rwxr-xr-x.travis/install_urllib3.sh7
-rw-r--r--tox.ini16
3 files changed, 26 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 06b5b70..7afcce2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,9 +60,11 @@ matrix:
env: TOXENV=pypy-cryptography1.1
- # Make sure we don't break Twisted
+ # Make sure we don't break Twisted or urllib3
- python: "2.7"
env: TOXENV=py27-twistedMaster
+ - python: "3.5"
+ env: TOXENV=py35-urllib3Master
# Also run at least a little bit against an older version of OpenSSL.
diff --git a/.travis/install_urllib3.sh b/.travis/install_urllib3.sh
new file mode 100755
index 0000000..7e9758f
--- /dev/null
+++ b/.travis/install_urllib3.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+set -x
+
+git clone https://github.com/shazow/urllib3.git
+pip install ./urllib3[socks]
diff --git a/tox.ini b/tox.ini
index c2591b8..d460568 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,6 +31,22 @@ commands =
python -c "import cryptography; print(cryptography.__version__)"
trial twisted
+[testenv:py35-urllib3Master]
+basepython=python3.5
+deps =
+ pyasn1
+ ndg-httpsclient
+ nose
+ mock
+ tornado
+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__)"
+ {toxinidir}/.travis/install_urllib3.sh
+ nosetests urllib3/test
+ rm -rf ./urllib3
+
[testenv:flake8]
deps =
flake8