8
8
from docker import Client as DockerClient
9
9
10
10
11
- @pytest .yield_fixture (scope = 'session' )
11
+ @pytest .fixture (scope = 'session' )
12
12
def loop (request ):
13
13
loop = asyncio .new_event_loop ()
14
14
asyncio .set_event_loop (None )
@@ -39,7 +39,7 @@ def pytest_addoption(parser):
39
39
help = "Don't perform docker images pulling" )
40
40
41
41
42
- @pytest .yield_fixture (scope = 'session' )
42
+ @pytest .fixture (scope = 'session' )
43
43
def redis_server (docker , session_id , loop , request ):
44
44
if not request .config .option .no_pull :
45
45
docker .pull ('redis:{}' .format ('latest' ))
@@ -77,7 +77,7 @@ def redis_params(redis_server):
77
77
return dict (** redis_server ['redis_params' ])
78
78
79
79
80
- @pytest .yield_fixture
80
+ @pytest .fixture
81
81
def redis (loop , redis_params ):
82
82
pool = None
83
83
@@ -96,7 +96,7 @@ def start(*args, no_loop=False, **kwargs):
96
96
loop .run_until_complete (pool .clear ())
97
97
98
98
99
- @pytest .yield_fixture (scope = 'session' )
99
+ @pytest .fixture (scope = 'session' )
100
100
def memcached_server (docker , session_id , loop , request ):
101
101
if not request .config .option .no_pull :
102
102
docker .pull ('memcached:{}' .format ('latest' ))
@@ -132,7 +132,7 @@ def memcached_params(memcached_server):
132
132
return dict (** memcached_server ['memcached_params' ])
133
133
134
134
135
- @pytest .yield_fixture
135
+ @pytest .fixture
136
136
def memcached (loop , memcached_params ):
137
137
conn = aiomcache .Client (loop = loop , ** memcached_params )
138
138
yield conn
0 commit comments