From 86a4afdc978c27152a813090531636c1e8737cd4 Mon Sep 17 00:00:00 2001 From: Ryan Barrett Date: Tue, 6 Jul 2021 20:33:48 -0700 Subject: [PATCH] flask: render: get tests working --- app.py | 1 - render.py | 7 +++++-- tests/test_render.py | 5 ++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app.py b/app.py index f5fc0ec..843d544 100644 --- a/app.py +++ b/app.py @@ -11,7 +11,6 @@ for module in ( 'add_webmention', 'logs', 'redirect', - 'render', 'salmon', 'superfeedr', 'webfinger', diff --git a/render.py b/render.py index 4ec49dd..3573eec 100644 --- a/render.py +++ b/render.py @@ -20,10 +20,13 @@ app.wsgi_app = handlers.ndb_context_middleware( cache = Cache(app) +def not_5xx(resp): + return isinstance(resp, tuple) and resp[1] // 100 != 5 + + @app.route('/render') @cache.cached(timeout=CACHE_TIME.total_seconds(), query_string=True, - # don't cache 5xxes - response_filter=lambda resp: resp[1] // 100 != 5) + response_filter=not_5xx) def render(): source = common.get_required_param(request, 'source') target = common.get_required_param(request, 'target') diff --git a/tests/test_render.py b/tests/test_render.py index 9350117..c20a72c 100644 --- a/tests/test_render.py +++ b/tests/test_render.py @@ -3,7 +3,7 @@ from oauth_dropins.webutil.util import json_dumps from models import Response -from render import app +from render import app, cache from . import testutil client = app.test_client() @@ -13,8 +13,7 @@ class RenderTest(testutil.TestCase): def setUp(self): super(RenderTest, self).setUp() - app.config['TESTING'] = True - + cache.clear() self.as2 = { '@context': 'https://www.w3.org/ns/activitystreams', 'type': 'Note',