diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-16 21:31:19 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-02-16 21:53:16 +0100 |
| commit | 6c9aeaab9e8d135e6460ae230215cda7af4bb2d3 (patch) | |
| tree | 14da75ad12468b1b9952c6a47552aea940581ca0 | |
| parent | 6b585023fd4ef068df7452a77f52b0c2ff490fd5 (diff) | |
| download | mitmproxy-6c9aeaab9e8d135e6460ae230215cda7af4bb2d3.tar.gz mitmproxy-6c9aeaab9e8d135e6460ae230215cda7af4bb2d3.tar.bz2 mitmproxy-6c9aeaab9e8d135e6460ae230215cda7af4bb2d3.zip | |
move py.test options to ini-file
| -rw-r--r-- | .appveyor.yml | 2 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | pytest.ini | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 1fc50c51..f23cd844 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -17,7 +17,7 @@ install: - "pip install --user -r requirements.txt" - "python -c \"from OpenSSL import SSL; print(SSL.SSLeay_version(SSL.SSLEAY_VERSION))\"" test_script: - - "py.test -s --cov-config .coveragerc --timeout 30 ./test/" + - "py.test ./test/" cache: - C:\Users\appveyor\AppData\Local\pip\cache deploy_script: 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 diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 00000000..6efbdeae --- /dev/null +++ b/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +testpaths = test +addopts = --timeout 30 -s |