From 7f08228191d1cad5e5e658b0dd22953be595419d Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Wed, 18 Apr 2018 15:41:51 +0100
Subject: [PATCH] testdir is no longer an option
---
tests/conftest.py | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/tests/conftest.py b/tests/conftest.py
index 271aaa337..d3482bba1 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -19,21 +19,14 @@ def pytest_addoption(parser):
action='store',
default=50,
help='Number of test iterations for imagewrapper')
-
+
parser.addoption('--testdir',
action='store',
help='FSLeyes test data directory')
parser.addoption('--seed',
type=int,
- help='Seed for random number generator')
-
-
-
-@pytest.fixture
-def testdir(request):
- """FSLeyes test data directory."""
- return op.expanduser(request.config.getoption('--testdir'))
+ help='Seed for random number generator')
@pytest.fixture
@@ -44,12 +37,12 @@ def niters(request):
@pytest.fixture
def seed(request):
-
+
seed = request.config.getoption('--seed')
if seed is None:
seed = np.random.randint(2 ** 32)
-
+
np.random.seed(seed)
random .seed(seed)
print('Seed for random number generator: {}'.format(seed))
--
GitLab