From 36b35b1d613b54205d7fb041c4960c0c1f9d34f9 Mon Sep 17 00:00:00 2001 From: Terry Chia Date: Sun, 14 Dec 2014 15:32:16 +0800 Subject: Move config in pytest.ini to tox.ini. --- pytest.ini | 5 ----- tox.ini | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 pytest.ini diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 0567f800..00000000 --- a/pytest.ini +++ /dev/null @@ -1,5 +0,0 @@ -[pytest] -addopts = -r s -markers = - requires_backend_interface: this test requires a specific backend interface - supported: parametrized test requiring only_if and skip_message diff --git a/tox.ini b/tox.ini index 85a095b5..677df7e4 100644 --- a/tox.ini +++ b/tox.ini @@ -76,3 +76,9 @@ application-import-names = cryptography,cryptography_vectors,tests [doc8] extensions = rst + +[pytest] +addopts = -r s +markers = + requires_backend_interface: this test requires a specific backend interface + supported: parametrized test requiring only_if and skip_message -- cgit v1.2.3