From 3705b60f25e2c78eac4ba6d82e9193c3df7a9509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 31 May 2019 10:22:46 +0200 Subject: [PATCH] Fixed unit test by doing late import For some reason the old pillar.auth stuck around, failing the `isinstance(some_object, auth.UserClass)` check because it compared to the old class and not the reloaded one. --- pillar/web/jinja.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pillar/web/jinja.py b/pillar/web/jinja.py index 71ea8534..1cc3533d 100644 --- a/pillar/web/jinja.py +++ b/pillar/web/jinja.py @@ -16,7 +16,6 @@ from werkzeug.local import LocalProxy import pillarsdk import pillar.api.utils -from pillar import auth from pillar.api.utils import pretty_duration from pillar.web.utils import pretty_date from pillar.web.nodes.routes import url_for_node @@ -227,6 +226,8 @@ def user_to_dict(user: auth.UserClass) -> dict: def do_json(some_object) -> str: + import pillar.auth + if isinstance(some_object, LocalProxy): return do_json(some_object._get_current_object()) if isinstance(some_object, pillarsdk.Resource):