aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.appveyor.yml2
-rw-r--r--.travis.yml4
-rw-r--r--pytest.ini3
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