[diffoscope] 02/02: Tidy tests.conftest
Chris Lamb
chris at chris-lamb.co.uk
Tue Apr 4 15:36:11 CEST 2017
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch experimental
in repository diffoscope.
commit c6b89314887ce9bca147cdf379737c2edd53dccc
Author: Chris Lamb <lamby at debian.org>
Date: Tue Apr 4 15:35:51 2017 +0200
Tidy tests.conftest
Gbp-Dch: ignore
---
tests/conftest.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/tests/conftest.py b/tests/conftest.py
index fa14ee4..5a38a62 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -26,19 +26,24 @@ from diffoscope.progress import ProgressManager
from diffoscope.comparators import ComparatorManager
-# Ensure set_locale fixture runs before each test.
-set_locale = pytest.fixture(autouse=True, scope='session')(set_locale)
-
def pytest_configure(config):
# Ensure set_path fixture runs before all tests.
set_path()
+
+ at pytest.fixture(autouse=True, scope='session')
+def locale():
+ # Ensure set_locale fixture runs before each test.
+ set_locale()
+
+
@pytest.fixture(autouse=True)
def reload_comparators():
# Reload Comparators after every test so we are always in a consistent
# state
ComparatorManager().reload()
+
@pytest.fixture(autouse=True)
def reset_progress():
ProgressManager().reset()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git
More information about the diffoscope
mailing list