diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2016-06-06 23:57:50 -0700 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2016-06-06 23:57:50 -0700 |
| commit | e115859bbd6759016bf96e2109a4cfa609560cc7 (patch) | |
| tree | d4bbc762806090443c4c059134571989034e1f76 | |
| parent | 1904afe3f089124b7041bfc3e664efb65b4b4c3a (diff) | |
| parent | d2281e0ab38e717e92d8d2e8f84600aa48d7aa9e (diff) | |
| download | mitmproxy-e115859bbd6759016bf96e2109a4cfa609560cc7.tar.gz mitmproxy-e115859bbd6759016bf96e2109a4cfa609560cc7.tar.bz2 mitmproxy-e115859bbd6759016bf96e2109a4cfa609560cc7.zip | |
Merge pull request #1216 from dufferzafar/pathod-lang-ws
Python 3 - pathod.language.websocket
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index b0eb8291..1cb5075e 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 test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_base.py test/pathod/test_language_http.py" + env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.py" - python: 3.5 - env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_base.py test/pathod/test_language_http.py" NO_ALPN=1 + env: SCOPE="netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_base.py test/pathod/test_language_http.py test/pathod/test_language_websocket.py" NO_ALPN=1 - python: 2.7 env: DOCS=1 script: 'cd docs && SPHINXOPTS="-W" make -e html' @@ -8,7 +8,7 @@ deps = -rrequirements.txt commands = py.test -n 8 --timeout 60 ./test [testenv:py35] -commands = py.test -n 8 --timeout 60 test/netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py test/pathod/test_language_http.py +commands = py.test -n 8 --timeout 60 test/netlib test/mitmproxy/script test/pathod/test_utils.py test/pathod/test_log.py test/pathod/test_language_generators.py test/pathod/test_language_writer.py test/pathod/test_language_base.py test/pathod/test_language_http.py test_language_websocket.py [testenv:lint] deps = flake8 |