summaryrefslogtreecommitdiff
path: root/testing
diff options
context:
space:
mode:
Diffstat (limited to 'testing')
-rw-r--r--testing/pytest.ini3
-rw-r--r--testing/tests/pytest.ini2
-rw-r--r--testing/tox.ini1
3 files changed, 3 insertions, 3 deletions
diff --git a/testing/pytest.ini b/testing/pytest.ini
new file mode 100644
index 00000000..2d34c607
--- /dev/null
+++ b/testing/pytest.ini
@@ -0,0 +1,3 @@
+[pytest]
+testpaths = tests
+norecursedirs = tests/perf
diff --git a/testing/tests/pytest.ini b/testing/tests/pytest.ini
deleted file mode 100644
index 3d785ca7..00000000
--- a/testing/tests/pytest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[pytest]
-norecursedirs = perf
diff --git a/testing/tox.ini b/testing/tox.ini
index a25bc1e6..a7d62189 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -3,7 +3,6 @@ envlist = py27
[testenv]
commands = py.test {posargs}
-changedir = tests
deps =
pytest
pytest-twisted