aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShadab Zafar <dufferzafar0@gmail.com>2016-06-06 00:54:05 +0530
committerShadab Zafar <dufferzafar0@gmail.com>2016-06-07 11:40:17 +0530
commitd2281e0ab38e717e92d8d2e8f84600aa48d7aa9e (patch)
tree6f9cd913430398f25ecdb705fe353acfb064d9c6
parent1ffc273c9433fc8840b71c79879ae427c93313bd (diff)
downloadmitmproxy-d2281e0ab38e717e92d8d2e8f84600aa48d7aa9e.tar.gz
mitmproxy-d2281e0ab38e717e92d8d2e8f84600aa48d7aa9e.tar.bz2
mitmproxy-d2281e0ab38e717e92d8d2e8f84600aa48d7aa9e.zip
Enable Travis for test/pathod/test_language_websocket
-rw-r--r--.travis.yml4
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 5b78d331..87affb9b 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'
diff --git a/tox.ini b/tox.ini
index a1e6a816..9fb563a0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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