diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2016-05-29 11:14:46 +1200 |
commit | ed415877d48251774012bd6aad4be91e9d558b79 (patch) | |
tree | e12a399c6df498f24aa5eeb9652dfaa90ab98dae /.travis.yml | |
parent | 00426534982ab7fba5617ad6422c13483a8e6521 (diff) | |
parent | 7971dce2231bc32c25b962d425d8ad935568a699 (diff) | |
download | mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.gz mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.tar.bz2 mitmproxy-ed415877d48251774012bd6aad4be91e9d558b79.zip |
Merge branch 'master' into solidcore
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 4a01174a..0c37b53f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,9 @@ matrix: git: depth: 9999999 - python: 3.5 - env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py" + env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py" - python: 3.5 - env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py" NO_ALPN=1 + env: SCOPE="netlib ./test/mitmproxy/script ./test/pathod/test_utils.py ./test/pathod/test_log.py" NO_ALPN=1 - python: 2.7 env: DOCS=1 script: 'cd docs && make html' |