summaryrefslogtreecommitdiff
path: root/testing/tests/perf/conftest.py
diff options
context:
space:
mode:
authorVictor Shyba <victor.shyba@gmail.com>2016-08-19 17:04:27 -0300
committerVictor Shyba <victor.shyba@gmail.com>2016-08-22 12:36:16 -0300
commit6f5bc4d7301147c35a9651cf423804c6de252647 (patch)
tree1b58612d9f360d249f5dbdedb724782d9fba3f9f /testing/tests/perf/conftest.py
parent481fa255bf3cb53fd932bd984cd40d097ca7bb61 (diff)
[test] make all nested fixture function-scoped
function is the default scope, so there is no need to pass this parameter. Previously, one of the scopes was 'module', but it is a nested function that fires on demand, so it should clean up itself from test to test in order to avoid conflict while putting.
Diffstat (limited to 'testing/tests/perf/conftest.py')
-rw-r--r--testing/tests/perf/conftest.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/testing/tests/perf/conftest.py b/testing/tests/perf/conftest.py
index 4b2186db..0b66263a 100644
--- a/testing/tests/perf/conftest.py
+++ b/testing/tests/perf/conftest.py
@@ -80,7 +80,7 @@ class SoledadDatabases(object):
requests.delete(self._shared_db_url)
-@pytest.fixture(scope='module')
+@pytest.fixture()
def soledad_dbs(request):
couch_url = request.config.option.couch_url
@@ -109,7 +109,7 @@ class UserDatabase(object):
requests.delete(self._remote_db_url)
-@pytest.fixture(scope='function')
+@pytest.fixture()
def remote_db(request):
couch_url = request.config.option.couch_url
@@ -178,7 +178,7 @@ def soledad_server(tmpdir_factory, request):
return server
-@pytest.fixture(scope='function')
+@pytest.fixture()
def txbenchmark(benchmark):
def blockOnThread(*args, **kwargs):
return threads.deferToThread(
@@ -187,7 +187,7 @@ def txbenchmark(benchmark):
return blockOnThread
-@pytest.fixture(scope='function')
+@pytest.fixture()
def txbenchmark_with_setup(benchmark):
def blockOnThreadWithSetup(setup, f):
def blocking_runner(*args, **kwargs):