Convert groups API to _Backend

crobinso · crobinso · commit 4d6c31e794ab · 2020-01-12T14:02:51.000-05:00
* Add REST imple
* Add unittest coverage
* Add functional test coverage

* Use new listify

Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/_backendbase.py b/bugzilla/_backendbase.py
@@ -204,6 +204,17 @@ def externalbugs_remove(self, paramdict):
         raise NotImplementedError()
 
 
+    ##############
+    # Group APIs #
+    ##############
+
+    def group_get(self, paramdict):
+        """
+        https://bugzilla.readthedocs.io/en/latest/api/core/v1/group.html#get-group
+        """
+        raise NotImplementedError()
+
+
     ################
     # Product APIs #
     ################
diff --git a/bugzilla/_backendrest.py b/bugzilla/_backendrest.py
@@ -167,6 +167,9 @@ def externalbugs_update(self, paramdict):
         raise BugzillaError(
             "No REST API available yet for externalbugs_update")
 
+    def group_get(self, paramdict):
+        return self._get("/group", paramdict)
+
     def product_get(self, paramdict):
         return self._get("/product/get", paramdict)
     def product_get_accessible(self):
diff --git a/bugzilla/_backendxmlrpc.py b/bugzilla/_backendxmlrpc.py
@@ -218,6 +218,9 @@ def externalbugs_update(self, paramdict):
     def externalbugs_remove(self, paramdict):
         return self._xmlrpc_proxy.ExternalBugs.remove_external_bug(paramdict)
 
+    def group_get(self, paramdict):
+        return self._xmlrpc_proxy.Group.get(paramdict)
+
     def product_get(self, paramdict):
         return self._xmlrpc_proxy.Product.get(paramdict)
     def product_get_accessible(self):
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -1913,7 +1913,7 @@ def _getgroups(self, names, membership=False):
         """
         params = {"membership": membership}
         params['names'] = listify(names)
-        return self._proxy.Group.get(params)
+        return self._backend.group_get(params)
 
     def getgroup(self, name, membership=False):
         """
diff --git a/bugzilla/bug.py b/bugzilla/bug.py
@@ -505,9 +505,6 @@ def members(self):
         """
         Retrieve the members of this Group from bugzilla
         """
-        if self.membership:
-            return self.membership
-
-        self.refresh(membership=True)
-
+        if not self.membership:
+            self.refresh(membership=True)
         return self.membership
diff --git a/tests/data/mockargs/test_api_groups_get1.txt b/tests/data/mockargs/test_api_groups_get1.txt
@@ -0,0 +1 @@
+{'membership': False, 'names': ['TestGroups']}
diff --git a/tests/data/mockargs/test_api_groups_get2.txt b/tests/data/mockargs/test_api_groups_get2.txt
@@ -0,0 +1 @@
+{'membership': True, 'names': ['TestGroup']}
diff --git a/tests/mockbackend.py b/tests/mockbackend.py
@@ -86,6 +86,9 @@ def component_get(self, *args):
     def component_update(self, *args):
         return self.__helper(args)
 
+    def group_get(self, *args):
+        return self.__helper(args)
+
     def externalbugs_add(self, *args):
         return self.__helper(args)
     def externalbugs_update(self, *args):
diff --git a/tests/test_api_groups.py b/tests/test_api_groups.py
@@ -0,0 +1,60 @@
+#
+# Copyright Red Hat, Inc. 2012
+#
+# This work is licensed under the GNU GPLv2 or later.
+# See the COPYING file in the top-level directory.
+#
+
+"""
+Test miscellaneous API bits
+"""
+
+import tests
+import tests.mockbackend
+
+
+def test_api_groups():
+    # Basic API testing of the users APIs
+    group_ret = {"groups": [{
+        "membership": [
+            {"real_name": "Bugzilla User",
+            "can_login": 1,
+            "name": "user@bugzilla.org",
+            "login_denied_text": "",
+            "id": 85,
+            "email_enabled": 1,
+            "email": "user@bugzilla.org"},
+            {"real_name": "Bugzilla User2",
+            "can_login": 0,
+            "name": "user2@bugzilla.org",
+            "login_denied_text": "",
+            "id": 77,
+            "email_enabled": 0,
+            "email": "user2@bugzilla.org"},
+        ],
+        "is_active": 1,
+        "description": "Test Group",
+        "user_regexp": "",
+        "is_bug_group": 1,
+        "name": "TestGroup",
+        "id": 9
+    }]}
+
+    fakebz = tests.mockbackend.make_bz(
+        group_get_args="data/mockargs/test_api_groups_get1.txt",
+        group_get_return=group_ret)
+
+    # getgroups testing
+    groupobj = fakebz.getgroups("TestGroups")[0]
+    assert groupobj.groupid == 9
+    assert groupobj.member_emails == [
+        "user2@bugzilla.org", "user@bugzilla.org"]
+    assert groupobj.name == "TestGroup"
+
+    # getgroup testing
+    fakebz = tests.mockbackend.make_bz(
+        group_get_args="data/mockargs/test_api_groups_get2.txt",
+        group_get_return=group_ret)
+    groupobj = fakebz.getgroup("TestGroup", membership=True)
+    groupobj.membership = []
+    assert groupobj.members() == group_ret["groups"][0]["membership"]
diff --git a/tests/test_rw_functional.py b/tests/test_rw_functional.py
@@ -696,6 +696,15 @@ def test11UserUpdate(backends):
         assert group in user.groupnames
     origgroups = user.groupnames
 
+    # Test group_get
+    try:
+        group = bz.getgroup("fedora_contrib")
+        group.refresh()
+    except Exception as e:
+        if have_admin:
+            raise
+        assert bugzilla.BugzillaError.get_bugzilla_error_code(e) == 805
+
     # Remove the group
     try:
         bz.updateperms(email, "remove", [group])

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{'membership': False, 'names': ['TestGroups']}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+{'membership': True, 'names': ['TestGroup']}`