Skip to content

Commit 61bbd6d

Browse files
committed
Don't use 'yield_fixture'
1 parent 3316334 commit 61bbd6d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/conftest.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from docker import Client as DockerClient
99

1010

11-
@pytest.yield_fixture(scope='session')
11+
@pytest.fixture(scope='session')
1212
def loop(request):
1313
loop = asyncio.new_event_loop()
1414
asyncio.set_event_loop(None)
@@ -39,7 +39,7 @@ def pytest_addoption(parser):
3939
help="Don't perform docker images pulling")
4040

4141

42-
@pytest.yield_fixture(scope='session')
42+
@pytest.fixture(scope='session')
4343
def redis_server(docker, session_id, loop, request):
4444
if not request.config.option.no_pull:
4545
docker.pull('redis:{}'.format('latest'))
@@ -77,7 +77,7 @@ def redis_params(redis_server):
7777
return dict(**redis_server['redis_params'])
7878

7979

80-
@pytest.yield_fixture
80+
@pytest.fixture
8181
def redis(loop, redis_params):
8282
pool = None
8383

@@ -96,7 +96,7 @@ def start(*args, no_loop=False, **kwargs):
9696
loop.run_until_complete(pool.clear())
9797

9898

99-
@pytest.yield_fixture(scope='session')
99+
@pytest.fixture(scope='session')
100100
def memcached_server(docker, session_id, loop, request):
101101
if not request.config.option.no_pull:
102102
docker.pull('memcached:{}'.format('latest'))
@@ -132,7 +132,7 @@ def memcached_params(memcached_server):
132132
return dict(**memcached_server['memcached_params'])
133133

134134

135-
@pytest.yield_fixture
135+
@pytest.fixture
136136
def memcached(loop, memcached_params):
137137
conn = aiomcache.Client(loop=loop, **memcached_params)
138138
yield conn

0 commit comments

Comments
 (0)