MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [tests] use more lenient internal call...

pull/9544/head
Raphaël Vinot 2024-02-02 12:16:19 +01:00
parent 451333c978
commit 65354d2ec3
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/testlive_comprehensive_local.py
View File

@ -48,7 +48,7 @@ def check_response(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)
return pymisp._check_response(response)
def publish_immediately(pymisp: PyMISP, event: Union[MISPEvent, int, str, uuid.UUID], with_email: bool = False):
@ -461,7 +461,7 @@ class TestComprehensive(unittest.TestCase):
self.assertEqual(len(event_with_local_tags.tags), 2)
self.assertEqual(len(event_with_local_tags.attributes[0].tags), 2)
event_without_local_tags = self.admin_misp_connector._check_json_response(self.admin_misp_connector._prepare_request('GET', f'events/view/{event.id}/excludeLocalTags:1'))
event_without_local_tags = self.admin_misp_connector._check_response(self.admin_misp_connector._prepare_request('GET', f'events/view/{event.id}/excludeLocalTags:1'))
check_response(event_without_local_tags)
self.assertEqual(event_without_local_tags["Event"]["Tag"][0]["local"], 0, event_without_local_tags)
@ -599,7 +599,7 @@ class TestComprehensive(unittest.TestCase):
check_response(self.admin_misp_connector.delete_event(event))
def test_remove_orphaned_correlations(self):
result = self.admin_misp_connector._check_json_response(self.admin_misp_connector._prepare_request('GET', 'servers/removeOrphanedCorrelations'))
result = self.admin_misp_connector._check_response(self.admin_misp_connector._prepare_request('GET', 'servers/removeOrphanedCorrelations'))
check_response(result)
self.assertIn("message", result)
@ -615,7 +615,7 @@ class TestComprehensive(unittest.TestCase):
second = check_response(self.admin_misp_connector.add_event(second))
check_response(self.admin_misp_connector.set_server_setting('MISP.background_jobs', 0, force=True))
result = self.admin_misp_connector._check_json_response(self.admin_misp_connector._prepare_request('POST', 'attributes/generateCorrelation'))
result = self.admin_misp_connector._check_response(self.admin_misp_connector._prepare_request('POST', 'attributes/generateCorrelation'))
check_response(result)
self.assertIn("message", result)
check_response(self.admin_misp_connector.set_server_setting('MISP.background_jobs', 1, force=True))
@ -707,7 +707,7 @@ class TestComprehensive(unittest.TestCase):
check_response(self.admin_misp_connector.set_server_setting('MISP.log_new_audit', 0, force=True))
audit_logs = self.admin_misp_connector._check_json_response(self.admin_misp_connector._prepare_request('GET', 'admin/audit_logs/index'))
audit_logs = self.admin_misp_connector._check_response(self.admin_misp_connector._prepare_request('GET', 'admin/audit_logs/index'))
check_response(audit_logs)
self.assertGreater(len(audit_logs), 0)
@ -797,7 +797,7 @@ class TestComprehensive(unittest.TestCase):
self.assertEqual(403, response["errors"][0])
response = self.admin_misp_connector._prepare_request('GET', 'servers/serverSettingsEdit/Security.salt')
response = self.admin_misp_connector._check_json_response(response)
response = self.admin_misp_connector._check_response(response)
self.assertEqual(403, response["errors"][0])
def test_custom_warninglist(self):

16
tests/testlive_sync.py
View File

@ -37,7 +37,7 @@ assert server_test["post"] == 1
# Get remote user
url = f'servers/getRemoteUser/{remote_server["id"]}'
remote_user = pymisp._check_json_response(pymisp._prepare_request('GET', url))
remote_user = pymisp._check_response(pymisp._prepare_request('GET', url))
check_response(remote_user)
assert remote_user["Sync flag"] == "Yes"
assert remote_user["Role name"] == "admin"
@ -56,7 +56,7 @@ check_response(pymisp.publish(event))
# Publish event inline
url = f'events/publish/{event.id}/disable_background_processing:1'
push_event = pymisp._check_json_response(pymisp._prepare_request('POST', url))
push_event = pymisp._check_response(pymisp._prepare_request('POST', url))
check_response(push_event)
# Create testing galaxy cluster
@ -74,18 +74,18 @@ check_response(pymisp.publish_galaxy_cluster(galaxy_cluster))
# Preview index
url = f'servers/previewIndex/{remote_server["id"]}'
index_preview = pymisp._check_json_response(pymisp._prepare_request('GET', url))
index_preview = pymisp._check_response(pymisp._prepare_request('GET', url))
check_response(index_preview)
# Preview event
url = f'servers/previewEvent/{remote_server["id"]}/{event.uuid}'
event_preview = pymisp._check_json_response(pymisp._prepare_request('GET', url))
event_preview = pymisp._check_response(pymisp._prepare_request('GET', url))
check_response(event_preview)
assert event_preview["Event"]["uuid"] == event.uuid
# Test pull
url = f'servers/pull/{remote_server["id"]}/disable_background_processing:1'
pull_response = pymisp._check_json_response(pymisp._prepare_request('GET', url))
pull_response = pymisp._check_response(pymisp._prepare_request('GET', url))
check_response(pull_response)
assert "Pull completed. 0 events pulled, 0 events could not be pulled, 0 proposals pulled, 0 sightings pulled, 0 clusters pulled." == pull_response["message"], pull_response["message"]
@ -94,7 +94,7 @@ check_response(pymisp.server_pull(remote_server))
# Test push
url = f'servers/push/{remote_server["id"]}/full/disable_background_processing:1'
push_response = pymisp._check_json_response(pymisp._prepare_request('GET', url))
push_response = pymisp._check_response(pymisp._prepare_request('GET', url))
check_response(push_response)
assert "Push complete. 0 events pushed, 0 events could not be pushed." == push_response["message"], push_response["message"]
@ -103,13 +103,13 @@ check_response(pymisp.server_push(remote_server))
# Test caching
url = f'servers/cache/{remote_server["id"]}/disable_background_processing:1'
cache_response = pymisp._check_json_response(pymisp._prepare_request('GET', url))
cache_response = pymisp._check_response(pymisp._prepare_request('GET', url))
check_response(cache_response)
assert "Caching the servers has successfully completed." == cache_response["message"], cache_response["message"]
# Test fetching available sync filtering rules
url = f'servers/queryAvailableSyncFilteringRules/{remote_server["id"]}'
rules_response = pymisp._check_json_response(pymisp._prepare_request('GET', url))
rules_response = pymisp._check_response(pymisp._prepare_request('GET', url))
check_response(rules_response)
# Delete server and test event