Fix tests (#1557)

Author: Dreamsorcerer

demos/polls/tests/test_integration.py

@@ -5,22 +5,22 @@
 
 
 async def test_index(cli, tables_and_data):
-    response = await cli.get('/')
-    assert response.status == 200
-    # TODO: resolve question with html code "'" instead of apostrophe in
-    # assert 'What\'s new?' in await response.text()
-    assert 'Main' in await response.text()
+    async with cli.get('/') as response:
+        assert response.status == 200
+        # TODO: resolve question with html code "'" instead of apostrophe in
+        # assert 'What\'s new?' in await response.text()
+        assert 'Main' in await response.text()
 
 
 async def test_results(cli, tables_and_data):
-    response = await cli.get('/poll/1/results')
-    assert response.status == 200
-    assert 'Just hacking again' in await response.text()
+    async with cli.get('/poll/1/results') as response:
+        assert response.status == 200
+        assert 'Just hacking again' in await response.text()
 
 
 async def test_404_status(cli, tables_and_data):
-    response = await cli.get('/no-such-route')
-    assert response.status == 404
+    async with cli.get('/no-such-route') as response:
+        assert response.status == 404
 
 
 async def test_vote(cli, tables_and_data):
@@ -38,11 +38,11 @@ async def test_vote(cli, tables_and_data):
         not_much_choice_id = not_much_choice.id
         votes_before = not_much_choice.votes
 
-        response = await cli.post(
+        async with cli.post(
             f'/poll/{question_id}/vote',
             data={'choice': not_much_choice_id}
-        )
-        assert response.status == 200
+        ) as response:
+            assert response.status == 200
 
     async with cli.server.app[db_key].begin() as sess:
         result = await sess.scalars(

demos/shortify/shortify/main.py

@@ -1,28 +1,25 @@
 import asyncio
 import logging
 import pathlib
+from collections.abc import AsyncIterator
 
 import aiohttp_jinja2
 import jinja2
 from aiohttp import web
-from redis.asyncio import Redis
+from redis import asyncio as aioredis
 
 from shortify.routes import setup_routes
-from shortify.utils import init_redis, load_config
-from shortify.views import SiteHandler
-
+from shortify.utils import CONF_KEY, REDIS_KEY, load_config
 
 PROJ_ROOT = pathlib.Path(__file__).parent.parent
 TEMPLATES_ROOT = pathlib.Path(__file__).parent / 'templates'
 
-# Define AppKey for Redis
-REDIS_KEY = web.AppKey("REDIS_KEY", Redis)
-
 
-async def setup_redis(app, conf):
-    redis = await init_redis(conf["redis"])
-    app[REDIS_KEY] = redis
-    return redis
+async def redis_ctx(app: web.Application) -> AsyncIterator[None]:
+    conf = app[CONF_KEY]["redis"]
+    async with await aioredis.from_url(f"redis://{conf['host']}:{conf['port']}") as redis:
+        app[REDIS_KEY] = redis
+        yield
 
 
 def setup_jinja(app):
@@ -35,12 +32,11 @@ async def init():
     conf = load_config(PROJ_ROOT / "config" / "config.yml")
 
     app = web.Application()
-    redis = await setup_redis(app, conf)
+    app[CONF_KEY] = conf
+    app.cleanup_ctx.append(redis_ctx)
     setup_jinja(app)
 
-    handler = SiteHandler(redis, conf)
-
-    setup_routes(app, handler, PROJ_ROOT)
+    setup_routes(app, PROJ_ROOT)
     host, port = conf['host'], conf['port']
     return app, host, port
 

demos/shortify/shortify/routes.py

@@ -1,9 +1,11 @@
-def setup_routes(app, handler, project_root):
+from shortify.views import index, redirect, shortify
+
+
+def setup_routes(app, project_root):
     router = app.router
-    h = handler
-    router.add_get('/', h.index, name='index')
-    router.add_get('/{short_id}', h.redirect, name='short')
-    router.add_post('/shortify', h.shortify, name='shortify')
+    router.add_get('/', index, name='index')
+    router.add_get('/{short_id}', redirect, name='short')
+    router.add_post('/shortify', shortify, name='shortify')
     router.add_static(
         '/static/', path=str(project_root / 'static'),
         name='static')

demos/shortify/shortify/utils.py

@@ -1,9 +1,10 @@
-from redis import asyncio as aioredis
 import trafaret as t
 import yaml
 from aiohttp import web
+from redis.asyncio import Redis
 
-
+CONF_KEY = web.AppKey("CONF_KEY", dict[str, object])
+REDIS_KEY = web.AppKey("REDIS_KEY", Redis)
 CONFIG_TRAFARET = t.Dict(
     {
         t.Key('redis'): t.Dict(
@@ -27,13 +28,6 @@ def load_config(fname):
     return CONFIG_TRAFARET.check(data)
 
 
-async def init_redis(conf):
-    redis = await aioredis.from_url(
-        f"redis://{conf['host']}:{conf['port']}",
-    )
-    return redis
-
-
 CHARS = "abcdefghijkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789"
 
 

demos/shortify/shortify/views.py

@@ -1,39 +1,37 @@
 import aiohttp_jinja2
 from aiohttp import web
 
-from .utils import encode, fetch_url
+from .utils import CONF_KEY, REDIS_KEY, encode, fetch_url
 
 
-class SiteHandler:
+@aiohttp_jinja2.template('index.html')
+async def index(request):
+    return {}
 
-    def __init__(self, redis, conf):
-        self._redis = redis
-        self._conf = conf
 
-    @aiohttp_jinja2.template('index.html')
-    async def index(self, request):
-        return {}
+async def shortify(request):
+    data = await request.json()
+    long_url = fetch_url(data)
 
-    async def shortify(self, request):
-        data = await request.json()
-        long_url = fetch_url(data)
+    conf = request.app[CONF_KEY]
+    redis = request.app[REDIS_KEY]
+    index = await redis.incr("shortify:count")
+    path = encode(index - 1)
+    key = "shortify:{}".format(path)
+    await redis.set(key, long_url)
 
-        index = await self._redis.incr("shortify:count")
-        path = encode(index - 1)
-        key = "shortify:{}".format(path)
-        await self._redis.set(key, long_url)
+    url = "http://{host}:{port}/{path}".format(
+        host=conf['host'],
+        port=conf['port'],
+        path=path)
 
-        url = "http://{host}:{port}/{path}".format(
-            host=self._conf['host'],
-            port=self._conf['port'],
-            path=path)
+    return web.json_response({"url": url})
 
-        return web.json_response({"url": url})
 
-    async def redirect(self, request):
-        short_id = request.match_info['short_id']
-        key = 'shortify:{}'.format(short_id)
-        location = await self._redis.get(key)
-        if not location:
-            raise web.HTTPNotFound()
-        raise web.HTTPFound(location=location.decode())
+async def redirect(request):
+    short_id = request.match_info['short_id']
+    key = 'shortify:{}'.format(short_id)
+    location = await request.app[REDIS_KEY].get(key)
+    if not location:
+        raise web.HTTPNotFound()
+    raise web.HTTPFound(location=location.decode())

demos/shortify/tests/test_shortify.py

@@ -3,10 +3,9 @@ async def test_create_short_url(cli, clean_redis):
     long_url = "https://example.com/very/long/url/that/needs/shortening"
 
     async with cli.post("/shortify", json={"url": long_url}) as resp:
-        await resp.read()
         assert resp.status == 200
+        data = await resp.json()
 
-    data = await resp.json()
     assert "url" in data
     assert data["url"] == "http://127.0.0.1:9001/a"