From 7729b7576040df7d264a5333472a2ef44fd55319 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Wed, 16 Feb 2022 18:48:51 +0900 Subject: [PATCH] Fix UT failure due to horizon system-scope support When horizon introduced the system-scope support in [1], the way to mock User object in the helper class was changed a bit. It now requires to setup User._is_system_user attribute properly. This commit mirrors such change in openstack_dashboard/test/helpers. [1] https://review.opendev.org/c/openstack/horizon/+/816368 Change-Id: I84c30705f6d2371c1bd74ba1ade4be4543ccf650 --- heat_dashboard/test/helpers.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/heat_dashboard/test/helpers.py b/heat_dashboard/test/helpers.py index fadf09fd..6bce80d9 100644 --- a/heat_dashboard/test/helpers.py +++ b/heat_dashboard/test/helpers.py @@ -179,18 +179,20 @@ class TestCase(horizon_helpers.TestCase): authorized_tenants=None, enabled=True, domain_id=None, user_domain_name=None): def get_user(request): - return user.User(id=id, - token=token, - user=username, - domain_id=domain_id, - user_domain_name=user_domain_name, - tenant_id=tenant_id, - tenant_name=tenant_name, - service_catalog=service_catalog, - roles=roles, - enabled=enabled, - authorized_tenants=authorized_tenants, - endpoint=settings.OPENSTACK_KEYSTONE_URL) + ret = user.User(id=id, + token=token, + user=username, + domain_id=domain_id, + user_domain_name=user_domain_name, + tenant_id=tenant_id, + tenant_name=tenant_name, + service_catalog=service_catalog, + roles=roles, + enabled=enabled, + authorized_tenants=authorized_tenants, + endpoint=settings.OPENSTACK_KEYSTONE_URL) + ret._is_system_user = False + return ret utils.get_user = get_user def assertRedirectsNoFollow(self, response, expected_url):