diff --git a/tests/testlive_comprehensive_local.py b/tests/testlive_comprehensive_local.py index 8a40e60a6..3c81bf241 100644 --- a/tests/testlive_comprehensive_local.py +++ b/tests/testlive_comprehensive_local.py @@ -38,6 +38,11 @@ def check_response(response): return response +def request(pymisp: PyMISP, request_type: str, url: str, data: dict = {}) -> dict: + response = pymisp._prepare_request(request_type, url, data) + return pymisp._check_json_response(response) + + class MISPSetting: def __init__(self, admin_connector: PyMISP, new_setting: dict): self.admin_connector = admin_connector @@ -681,8 +686,7 @@ class TestComprehensive(unittest.TestCase): "entries": "1.2.3.4", } } - wl = self.admin_misp_connector._prepare_request('POST', 'warninglists/add', data=warninglist) - wl = self.admin_misp_connector._check_json_response(wl) + wl = request(self.admin_misp_connector, 'POST', 'warninglists/add', data=warninglist) check_response(wl) check_response(self.admin_misp_connector.enable_warninglist(wl["Warninglist"]["id"])) @@ -691,15 +695,28 @@ class TestComprehensive(unittest.TestCase): self.assertEqual(wl["Warninglist"]["id"], response["1.2.3.4"][0]["id"]) warninglist["Warninglist"]["entries"] = "1.2.3.4\n2.3.4.5" - response = self.admin_misp_connector._prepare_request('POST', f'warninglists/edit/{wl["Warninglist"]["id"]}', data=warninglist) - response = self.admin_misp_connector._check_json_response(response) + response = request(self.admin_misp_connector, 'POST', f'warninglists/edit/{wl["Warninglist"]["id"]}', data=warninglist) check_response(response) response = self.admin_misp_connector.values_in_warninglist("2.3.4.5") self.assertEqual(wl["Warninglist"]["id"], response["2.3.4.5"][0]["id"]) - response = self.admin_misp_connector._prepare_request('POST', f'warninglists/delete/{wl["Warninglist"]["id"]}') - response = self.admin_misp_connector._check_json_response(response) + warninglist["Warninglist"]["entries"] = "2.3.4.5" + response = request(self.admin_misp_connector, 'POST', f'warninglists/edit/{wl["Warninglist"]["id"]}', data=warninglist) + check_response(response) + + response = self.admin_misp_connector.values_in_warninglist("1.2.3.4") + self.assertEqual(0, len(response)) + + response = self.admin_misp_connector.values_in_warninglist("2.3.4.5") + self.assertEqual(wl["Warninglist"]["id"], response["2.3.4.5"][0]["id"]) + + check_response(self.admin_misp_connector.disable_warninglist(wl["Warninglist"]["id"])) + + response = self.admin_misp_connector.values_in_warninglist("2.3.4.5") + self.assertEqual(0, len(response)) + + response = request(self.admin_misp_connector, 'POST', f'warninglists/delete/{wl["Warninglist"]["id"]}') check_response(response) def _search(self, query: dict):