unit tests

Author: tomklapiscak

src/mas/devops/users.py

@@ -596,6 +596,9 @@ def delete_manage_api_key(self, manage_api_key):
 
         # extract the apikey's identifier from the href
         match = re.search(r'\/maximo\/api\/os\/mxapiapikey\/(.*)', manage_api_key['href'])
+        if match is None:
+            raise Exception(f"Could not parse API Key href: {manage_api_key['href']}")
+
         id = match.group(1)
 
         url = f"{self.manage_api_url_internal}/maximo/api/os/mxapiapikey/{id}"
@@ -618,7 +621,7 @@ def delete_manage_api_key(self, manage_api_key):
             raise Exception(f"{response.status_code} {response.text}")
 
     def get_manage_group_id(self, group_name, manage_api_key):
-        self.logger.debug(f"Getting ID for Manage group {group_name}")
+        self.logger.debug(f"Getting ID for Manage group with name {group_name}")
         url = f"{self.manage_api_url_internal}/maximo/api/os/mxapigroup"
         querystring = {
             "ccm": 1,
@@ -637,7 +640,7 @@ def get_manage_group_id(self, group_name, manage_api_key):
             verify=self.manage_internal_ca_pem_file_path,
         )
         if response.status_code != 200:
-            raise Exception(response.text)
+            raise Exception(f"{response.status_code} {response.text}")
 
         json = response.json()
 
@@ -647,6 +650,7 @@ def get_manage_group_id(self, group_name, manage_api_key):
         return None
 
     def is_user_in_manage_group(self, group_name, user_id, manage_api_key):
+        self.logger.debug(f"Checking if {user_id} is a member of Manage group with name {group_name}")
 
         group_id = self.get_manage_group_id(group_name, manage_api_key)
 

test/src/test_users.py

@@ -1062,7 +1062,60 @@ def test_delete_manage_api_key(user_utils, requests_mock):
     user_utils.delete_manage_api_key(apikey)
     assert delete.call_count == 1
 
-# TODO: href_does_not_parse
+
+def test_delete_manage_api_key_notfound(user_utils, requests_mock):
+    user_id = "user1"
+    apikey_id = "theapikeyid"
+    apikey = {"userid": user_id, "href": f"https://{MANAGE_API_URL}:{MANAGE_API_PORT}/maximo/api/os/mxapiapikey/{apikey_id}"}
+
+    delete = requests_mock.delete(
+        f"{MANAGE_API_URL}/maximo/api/os/mxapiapikey/{apikey_id}?ccm=1&lean=1",
+        request_headers={"accept": "application/json"},
+        text="notused",
+        status_code=404,
+        additional_matcher=lambda req: additional_matcher(req, cert=PEM_PATH)
+    )
+
+    user_utils.delete_manage_api_key(apikey)
+    assert delete.call_count == 1
+
+
+def test_delete_manage_api_key_bad_href(user_utils, requests_mock):
+    user_id = "user1"
+    apikey_id = "theapikeyid"
+    apikey = {"userid": user_id, "href": f"notgood/{apikey_id}"}
+
+    delete = requests_mock.delete(
+        f"{MANAGE_API_URL}/maximo/api/os/mxapiapikey/{apikey_id}?ccm=1&lean=1",
+        request_headers={"accept": "application/json"},
+        text="notused",
+        status_code=204,
+        additional_matcher=lambda req: additional_matcher(req, cert=PEM_PATH)
+    )
+
+    with pytest.raises(Exception) as excinfo:
+        user_utils.delete_manage_api_key(apikey)
+    assert str(excinfo.value) == f"Could not parse API Key href: notgood/{apikey_id}"
+    assert delete.call_count == 0
+
+
+def test_delete_manage_api_key_error(user_utils, requests_mock):
+    user_id = "user1"
+    apikey_id = "theapikeyid"
+    apikey = {"userid": user_id, "href": f"https://{MANAGE_API_URL}:{MANAGE_API_PORT}/maximo/api/os/mxapiapikey/{apikey_id}"}
+
+    delete = requests_mock.delete(
+        f"{MANAGE_API_URL}/maximo/api/os/mxapiapikey/{apikey_id}?ccm=1&lean=1",
+        request_headers={"accept": "application/json"},
+        text="boom",
+        status_code=500,
+        additional_matcher=lambda req: additional_matcher(req, cert=PEM_PATH)
+    )
+
+    with pytest.raises(Exception) as excinfo:
+        user_utils.delete_manage_api_key(apikey)
+    assert str(excinfo.value) == "500 boom"
+    assert delete.call_count == 1
 
 
 def test_get_manage_group_id(user_utils, requests_mock):