From d160edce57f1d4da126adaf5a61e03b4c01345c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= Date: Sat, 3 Aug 2019 00:54:08 +0200 Subject: [PATCH] fix: Inconsistency in MISPEvent, reenable tests --- pymisp/mispevent.py | 2 +- tests/mispevent_testfiles/malware_exist.json | 2 +- tests/test_mispevent.py | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pymisp/mispevent.py b/pymisp/mispevent.py index ac6ab91..7dd60be 100644 --- a/pymisp/mispevent.py +++ b/pymisp/mispevent.py @@ -567,7 +567,7 @@ class MISPEvent(AbstractMISP): for rel_event in kwargs.pop('RelatedEvent'): sub_event = MISPEvent() sub_event.load(rel_event) - self.RelatedEvent.append(sub_event) + self.RelatedEvent.append({'Event': sub_event}) if kwargs.get('Tag'): for tag in kwargs.pop('Tag'): self.add_tag(tag) diff --git a/tests/mispevent_testfiles/malware_exist.json b/tests/mispevent_testfiles/malware_exist.json index fc6b658..d118168 100644 --- a/tests/mispevent_testfiles/malware_exist.json +++ b/tests/mispevent_testfiles/malware_exist.json @@ -64,7 +64,7 @@ "object_id": "2279", "object_relation": "malware-sample", "value": "simple.json|7637beddacbeac59d44469b2b120b9e6", - "data": "UEsDBAoACQAAAEOAJEyjHboUIQAAABUAAAAgABwANzYzN2JlZGRhY2JlYWM1OWQ0NDQ2OWIyYjEyMGI5ZTZVVAkAA\/5PTlr+T05adXgLAAEEIQAAAAQhAAAATvzonhGOj12MyB1QeGLJ5iZhOjD+zymV4FU2+kjD4oTYUEsHCKMduhQhAAAAFQAAAFBLAwQKAAkAAABDgCRMg45UABcAAAALAAAALQAcADc2MzdiZWRkYWNiZWFjNTlkNDQ0NjliMmIxMjBiOWU2LmZpbGVuYW1lLnR4dFVUCQAD\/k9OWv5PTlp1eAsAAQQhAAAABCEAAADDgZOh6307Bduy829xtRjpivO\/xFI3KVBLBwiDjlQAFwAAAAsAAABQSwECHgMKAAkAAABDgCRMox26FCEAAAAVAAAAIAAYAAAAAAABAAAApIEAAAAANzYzN2JlZGRhY2JlYWM1OWQ0NDQ2OWIyYjEyMGI5ZTZVVAUAA\/5PTlp1eAsAAQQhAAAABCEAAABQSwECHgMKAAkAAABDgCRMg45UABcAAAALAAAALQAYAAAAAAABAAAApIGLAAAANzYzN2JlZGRhY2JlYWM1OWQ0NDQ2OWIyYjEyMGI5ZTYuZmlsZW5hbWUudHh0VVQFAAP+T05adXgLAAEEIQAAAAQhAAAAUEsFBgAAAAACAAIA2QAAABkBAAAAAA==", + "data": "UEsDBAoACQAAAFYGA0/yk6nqEAAAAAQAAAAgABwANWI3NmIwZWVmOWFmOGEyMzAwNjczZTA1NTNmNjA5ZjlVVAkAA0O+RF1DvkRddXgLAAEEIQAAAAQhAAAAKjTWvfZCN4PlYePhL4s52lBLBwjyk6nqEAAAAAQAAABQSwMECgAJAAAAVgYDT4OOVAAXAAAACwAAAC0AHAA1Yjc2YjBlZWY5YWY4YTIzMDA2NzNlMDU1M2Y2MDlmOS5maWxlbmFtZS50eHRVVAkAA0O+RF1DvkRddXgLAAEEIQAAAAQhAAAAGOK3WSE/A/8NRU5Dlo6Z5J+yV17raVlQSwcIg45UABcAAAALAAAAUEsBAh4DCgAJAAAAVgYDT/KTqeoQAAAABAAAACAAGAAAAAAAAQAAAKSBAAAAADViNzZiMGVlZjlhZjhhMjMwMDY3M2UwNTUzZjYwOWY5VVQFAANDvkRddXgLAAEEIQAAAAQhAAAAUEsBAh4DCgAJAAAAVgYDT4OOVAAXAAAACwAAAC0AGAAAAAAAAQAAAKSBegAAADViNzZiMGVlZjlhZjhhMjMwMDY3M2UwNTUzZjYwOWY5LmZpbGVuYW1lLnR4dFVUBQADQ75EXXV4CwABBCEAAAAEIQAAAFBLBQYAAAAAAgACANkAAAAIAQAAAAA=", "ShadowAttribute": [] }, { diff --git a/tests/test_mispevent.py b/tests/test_mispevent.py index 603d349..854fca7 100644 --- a/tests/test_mispevent.py +++ b/tests/test_mispevent.py @@ -110,7 +110,6 @@ class TestMISPEvent(unittest.TestCase): ref_json = json.load(f) self.assertEqual(self.mispevent.to_json(), json.dumps(ref_json, sort_keys=True, indent=2)) - @unittest.skip("fixme") def test_existing_malware(self): self.mispevent.load_file('tests/mispevent_testfiles/malware_exist.json') with open('tests/mispevent_testfiles/simple.json', 'rb') as f: @@ -126,7 +125,6 @@ class TestMISPEvent(unittest.TestCase): ref_json = json.load(f) self.assertEqual(sighting.to_json(), json.dumps(ref_json, sort_keys=True, indent=2)) - @unittest.skip("fixme") def test_existing_event(self): self.mispevent.load_file('tests/mispevent_testfiles/existing_event.json') with open('tests/mispevent_testfiles/existing_event.json', 'r') as f: @@ -235,7 +233,6 @@ class TestMISPEvent(unittest.TestCase): self.assertTrue(self.mispevent.objects[0].edited) self.assertTrue(self.mispevent.edited) - @unittest.skip("fixme") def test_event_object_attribute_edited_tag(self): self.mispevent.load_file('tests/mispevent_testfiles/existing_event.json') self.assertFalse(self.mispevent.edited)