From da86bc79798c05ec469d76f375741f306213e4d0 Mon Sep 17 00:00:00 2001
From: BonfaceKilz
Date: Fri, 15 Oct 2021 13:01:38 +0300
Subject: Replace "resource_id" with "resource_info" dict

This avoids calling Redis twice when fetching metadata about the
resource.
---
 .../tests/unit/wqflask/test_resource_manager.py    | 36 +++++++++++++---------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'wqflask/tests')

diff --git a/wqflask/tests/unit/wqflask/test_resource_manager.py b/wqflask/tests/unit/wqflask/test_resource_manager.py
index b0b7e6a3..9d5aaf0b 100644
--- a/wqflask/tests/unit/wqflask/test_resource_manager.py
+++ b/wqflask/tests/unit/wqflask/test_resource_manager.py
@@ -58,18 +58,26 @@ class TestCheckUserAccessRole(unittest.TestCase):
     """Test cases for `get_user_access_roles`"""
 
     def setUp(self):
+        self.resource_info = {
+            "owner_id": "8ad942fe-490d-453e-bd37",
+            "default_mask": {
+                "data": "no-access",
+                "metadata": "no-access",
+                "admin": "not-admin",
+            },
+            "group_masks": {
+                "7fa95d07-0e2d-4bc5-b47c-448fdc1260b2": {
+                    "metadata": "edit",
+                    "data": "edit",
+                }},
+            "name": "_14329",
+            "data": {
+                "dataset": 1,
+                "trait": 14329,
+            },
+            "type": "dataset-publish",
+            }
         conn = mock.MagicMock()
-        conn.hget.return_value = (
-            '{"owner_id": "8ad942fe-490d-453e-bd37", '
-            '"default_mask": {"data": "no-access", '
-            '"metadata": "no-access", '
-            '"admin": "not-admin"}, '
-            '"group_masks": '
-            '{"7fa95d07-0e2d-4bc5-b47c-448fdc1260b2": '
-            '{"metadata": "edit", "data": "edit"}}, '
-            '"name": "_14329", "'
-            'data": {"dataset": 1, "trait": 14329}, '
-            '"type": "dataset-publish"}')
 
         conn.hgetall.return_value = {
             '7fa95d07-0e2d-4bc5-b47c-448fdc1260b2': (
@@ -85,7 +93,7 @@ class TestCheckUserAccessRole(unittest.TestCase):
         """Test that the right access roles are set"""
         self.assertEqual(get_user_access_roles(
             conn=self.conn,
-            resource_id="",  # Can be anything
+            resource_info=self.resource_info,
             user_id="8ad942fe-490d-453e-bd37"),
                          {"data": DataRole.EDIT,
                           "metadata": DataRole.EDIT,
@@ -94,7 +102,7 @@ class TestCheckUserAccessRole(unittest.TestCase):
     def test_get_user_access_default_mask(self):
         self.assertEqual(get_user_access_roles(
             conn=self.conn,
-            resource_id="",  # Can be anything
+            resource_info=self.resource_info,
             user_id=""),
                          {"data": DataRole.NO_ACCESS,
                           "metadata": DataRole.NO_ACCESS,
@@ -103,7 +111,7 @@ class TestCheckUserAccessRole(unittest.TestCase):
     def test_get_user_access_group_mask(self):
         self.assertEqual(get_user_access_roles(
             conn=self.conn,
-            resource_id="",  # Can be anything
+            resource_info=self.resource_info,
             user_id="8ad942fe-490d-453e-bd37-56f252e41603"),
                          {"data": DataRole.EDIT,
                           "metadata": DataRole.EDIT,
-- 
cgit v1.2.3