aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-02-16 21:31:19 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-02-16 21:53:16 +0100
commit6c9aeaab9e8d135e6460ae230215cda7af4bb2d3 (patch)
tree14da75ad12468b1b9952c6a47552aea940581ca0 /.travis.yml
parent6b585023fd4ef068df7452a77f52b0c2ff490fd5 (diff)
downloadmitmproxy-6c9aeaab9e8d135e6460ae230215cda7af4bb2d3.tar.gz
mitmproxy-6c9aeaab9e8d135e6460ae230215cda7af4bb2d3.tar.bz2
mitmproxy-6c9aeaab9e8d135e6460ae230215cda7af4bb2d3.zip
move py.test options to ini-file
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index f459dce3..06b31773 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ before_script:
- "openssl version -a"
script:
- - "py.test -s --cov-config .coveragerc --timeout 30 ./test/$SCOPE"
+ - "py.test ./test/$SCOPE"
after_success:
- coveralls
@@ -72,4 +72,4 @@ cache:
directories:
- $HOME/.cache/pip
- $HOME/.pyenv
- - $HOME/Library/Caches/pip \ No newline at end of file
+ - $HOME/Library/Caches/pip