summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Abramowitz <marc@marc-abramowitz.com>2016-03-08 09:47:55 -0800
committerMarc Abramowitz <marc@marc-abramowitz.com>2016-03-08 09:47:55 -0800
commitfb1269dfa01ef1799c0752eaa3337200299e1309 (patch)
tree64d39db50e027b945a487160adef974c49105af4
parentbd04986eacdfa26baaf0e47132e7e2ae6cb3b577 (diff)
downloadpastedeploy-fb1269dfa01ef1799c0752eaa3337200299e1309.tar.gz
Use pytest.ini testpaths
and don't have to put `tests/` in tox.ini posargs
-rw-r--r--pytest.ini2
-rw-r--r--tox.ini6
2 files changed, 5 insertions, 3 deletions
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..5ee6477
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+testpaths = tests
diff --git a/tox.ini b/tox.ini
index 7dbfdd7..633d7e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ deps =
Paste
pytest
commands =
- py.test {posargs:tests/}
+ py.test {posargs}
[testenv:cover]
basepython = python2.7
@@ -16,7 +16,7 @@ deps =
{[testenv]deps}
pytest-cov
commands =
- py.test {posargs:--cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing tests/}
+ py.test --cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing {posargs}
[testenv:cover3]
basepython = python3.5
@@ -25,4 +25,4 @@ deps =
{[testenv]deps}
pytest-cov
commands =
- py.test {posargs:--cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing tests/}
+ py.test --cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing {posargs}