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

chg: [tests] Check the type of the response

pull/471/head
Raphaël Vinot 2019-08-26 20:18:12 +02:00
parent 1f74a943e6
commit bfd57e7741
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymisp/aping.py
View File

@ -1754,7 +1754,7 @@ class ExpandedPyMISP(PyMISP):
event_id = self.__get_uuid_or_id_from_abstract_misp(event)
organisation_id = self.__get_uuid_or_id_from_abstract_misp(organisation)
if self._old_misp((2, 4, 114), '2020-01-01', sys._getframe().f_code.co_name):
# FIXME: https://github.com/MISP/MISP/issues/5055
# https://github.com/MISP/MISP/issues/5055
organisation_id = organisation.id
data = {'event_id': event_id, 'org_id': organisation_id, 'distribution': distribution, 'message': message}
elif event_delegation:

2
tests/testlive_comprehensive.py
View File

@ -1872,6 +1872,7 @@ class TestComprehensive(unittest.TestCase):
delegations = self.delegate_user_misp_connector.event_delegations()
self.assertEqual(delegations[0].id, delegation.id)
e = self.delegate_user_misp_connector.accept_event_delegation(delegation)
self.assertTrue(isinstance(e, MISPEvent), e)
self.assertEqual(e.info, 'Test Roles')
self.assertEqual(e.org.name, 'Test Org - delegate')
r = self.delegate_user_misp_connector.delete_event(e)
@ -1879,6 +1880,7 @@ class TestComprehensive(unittest.TestCase):
e = test_roles_user_connector.add_event(base_event)
delegation = test_roles_user_connector.delegate_event(e, self.test_org_delegate)
e = test_roles_user_connector.discard_event_delegation(delegation.id)
self.assertTrue(isinstance(e, MISPEvent), e)
self.assertEqual(e.info, 'Test Roles')
self.assertEqual(e.org_id, int(self.test_org.id))
finally: