Skip to content

Commit 29ddff3

Browse files
Bump pytest-aiohttp from 0.3.0 to 1.0.3 (#668)
* Bump pytest-aiohttp from 0.3.0 to 1.0.3 Bumps [pytest-aiohttp](https://github.com/aio-libs/pytest-aiohttp) from 0.3.0 to 1.0.3. - [Release notes](https://github.com/aio-libs/pytest-aiohttp/releases) - [Changelog](https://github.com/aio-libs/pytest-aiohttp/blob/master/CHANGES.rst) - [Commits](aio-libs/pytest-aiohttp@v0.3.0...v1.0.3) --- updated-dependencies: - dependency-name: pytest-aiohttp dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Rename Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sam Bull <[email protected]>
1 parent 3bc5170 commit 29ddff3

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

requirements-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pep257==0.7.0
1717
pre-commit==2.17.0
1818
pynacl==1.5.0
1919
pytest==6.2.5
20-
pytest-aiohttp==0.3.0
20+
pytest-aiohttp==1.0.3
2121
pytest-cov==3.0.0
2222
pytest-mock==3.6.1
2323
pytest-sugar==0.9.4

tests/conftest.py

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def unused_port() -> int:
4242

4343

4444
@pytest.fixture(scope="session")
45-
def loop() -> Iterator[asyncio.AbstractEventLoop]:
45+
def event_loop() -> Iterator[asyncio.AbstractEventLoop]:
4646
loop = asyncio.new_event_loop()
4747
asyncio.set_event_loop(None)
4848

@@ -73,10 +73,10 @@ def docker() -> DockerClient: # type: ignore[misc] # No docker types.
7373
def redis_server( # type: ignore[misc] # No docker types.
7474
docker: DockerClient,
7575
session_id: str,
76-
loop: asyncio.AbstractEventLoop,
76+
event_loop: asyncio.AbstractEventLoop,
7777
) -> Iterator[_ContainerInfo]:
7878
image = "redis:{}".format("latest")
79-
asyncio.set_event_loop(loop)
79+
asyncio.set_event_loop(event_loop)
8080

8181
if sys.platform.startswith("darwin"):
8282
port = unused_port()
@@ -107,15 +107,15 @@ def redis_server( # type: ignore[misc] # No docker types.
107107
for _i in range(20):
108108
try:
109109
conn = aioredis.from_url(f"redis://{host}:{port}") # type: ignore[no-untyped-call] # noqa
110-
loop.run_until_complete(conn.set("foo", "bar"))
110+
event_loop.run_until_complete(conn.set("foo", "bar"))
111111
break
112112
except ConnectionError:
113113
time.sleep(delay)
114114
delay *= 2
115115
finally:
116-
loop.run_until_complete(conn.close())
116+
event_loop.run_until_complete(conn.close())
117117
# TODO: Remove once fixed: github.com/aio-libs/aioredis-py/issues/1103
118-
loop.run_until_complete(conn.connection_pool.disconnect())
118+
event_loop.run_until_complete(conn.connection_pool.disconnect())
119119
else:
120120
pytest.fail("Cannot start redis server")
121121

@@ -132,25 +132,25 @@ def redis_url(redis_server: _ContainerInfo) -> str: # type: ignore[misc]
132132

133133
@pytest.fixture
134134
def redis(
135-
loop: asyncio.AbstractEventLoop,
135+
event_loop: asyncio.AbstractEventLoop,
136136
redis_url: str,
137137
) -> Iterator[aioredis.Redis]:
138138
async def start(pool: aioredis.ConnectionPool) -> aioredis.Redis:
139139
return aioredis.Redis(connection_pool=pool)
140140

141-
asyncio.set_event_loop(loop)
141+
asyncio.set_event_loop(event_loop)
142142
pool = aioredis.ConnectionPool.from_url(redis_url)
143-
redis = loop.run_until_complete(start(pool))
143+
redis = event_loop.run_until_complete(start(pool))
144144
yield redis
145-
loop.run_until_complete(redis.close()) # type: ignore[no-untyped-call]
146-
loop.run_until_complete(pool.disconnect())
145+
event_loop.run_until_complete(redis.close()) # type: ignore[no-untyped-call]
146+
event_loop.run_until_complete(pool.disconnect())
147147

148148

149149
@pytest.fixture(scope="session")
150150
def memcached_server( # type: ignore[misc] # No docker types.
151151
docker: DockerClient,
152152
session_id: str,
153-
loop: asyncio.AbstractEventLoop,
153+
event_loop: asyncio.AbstractEventLoop,
154154
) -> Iterator[_ContainerInfo]:
155155

156156
image = "memcached:{}".format("latest")
@@ -183,14 +183,14 @@ def memcached_server( # type: ignore[misc] # No docker types.
183183
delay = 0.1
184184
for _i in range(20):
185185
try:
186-
conn = aiomcache.Client(host, port, loop=loop)
187-
loop.run_until_complete(conn.set(b"foo", b"bar"))
186+
conn = aiomcache.Client(host, port, loop=event_loop)
187+
event_loop.run_until_complete(conn.set(b"foo", b"bar"))
188188
break
189189
except ConnectionRefusedError:
190190
time.sleep(delay)
191191
delay *= 2
192192
finally:
193-
loop.run_until_complete(conn.close())
193+
event_loop.run_until_complete(conn.close())
194194
else:
195195
pytest.fail("Cannot start memcached server")
196196

@@ -209,8 +209,8 @@ def memcached_params( # type: ignore[misc]
209209

210210
@pytest.fixture
211211
def memcached( # type: ignore[misc]
212-
loop: asyncio.AbstractEventLoop, memcached_params: _MemcachedParams
212+
event_loop: asyncio.AbstractEventLoop, memcached_params: _MemcachedParams
213213
) -> Iterator[aiomcache.Client]:
214-
conn = aiomcache.Client(loop=loop, **memcached_params)
214+
conn = aiomcache.Client(loop=event_loop, **memcached_params)
215215
yield conn
216-
loop.run_until_complete(conn.close())
216+
event_loop.run_until_complete(conn.close())

0 commit comments

Comments
 (0)