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

chg: Fix test suite.

pull/749/head
Raphaël Vinot 2021-04-20 00:25:47 +02:00
parent cc1af2573f
commit 67457bec53
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/testlive_comprehensive.py
View File

@ -1223,7 +1223,7 @@ class TestComprehensive(unittest.TestCase):
# Test generic Tag methods # Test generic Tag methods
r = self.admin_misp_connector.tag(second, 'generic_tag_test') r = self.admin_misp_connector.tag(second, 'generic_tag_test')
self.assertTrue('successfully' in r['message'].lower() and f'Event ({second.id})' in r['message'], r['message']) self.assertTrue('successfully' in r['message'].lower() and f'({second.id})' in r['message'], r['message'])
second = self.user_misp_connector.get_event(second.id, pythonify=True) second = self.user_misp_connector.get_event(second.id, pythonify=True)
self.assertTrue('generic_tag_test' == second.tags[0].name) self.assertTrue('generic_tag_test' == second.tags[0].name)
@ -1237,7 +1237,7 @@ class TestComprehensive(unittest.TestCase):
# r = self.admin_misp_connector.untag(second.objects[0].uuid, 'generic_tag_test') # r = self.admin_misp_connector.untag(second.objects[0].uuid, 'generic_tag_test')
# self.assertTrue(r['message'].endswith(f'successfully removed from Object({second.objects[0].id}).'), r['message']) # self.assertTrue(r['message'].endswith(f'successfully removed from Object({second.objects[0].id}).'), r['message'])
r = self.admin_misp_connector.tag(second.objects[0].attributes[0].uuid, 'generic_tag_test') r = self.admin_misp_connector.tag(second.objects[0].attributes[0].uuid, 'generic_tag_test')
self.assertTrue('successfully' in r['message'].lower() and f'Attribute ({second.objects[0].attributes[0].id})' in r['message'], r['message']) self.assertTrue('successfully' in r['message'].lower() and f'({second.objects[0].attributes[0].id})' in r['message'], r['message'])
attr = self.user_misp_connector.get_attribute(second.objects[0].attributes[0].uuid, pythonify=True) attr = self.user_misp_connector.get_attribute(second.objects[0].attributes[0].uuid, pythonify=True)
self.assertTrue('generic_tag_test' == attr.tags[0].name) self.assertTrue('generic_tag_test' == attr.tags[0].name)
r = self.admin_misp_connector.untag(second.objects[0].attributes[0].uuid, 'generic_tag_test') r = self.admin_misp_connector.untag(second.objects[0].attributes[0].uuid, 'generic_tag_test')
@ -1422,11 +1422,11 @@ class TestComprehensive(unittest.TestCase):
# self.assertEqual(r['errors'][1]['message'], 'Invalid Tag. This tag can only be set by a fixed organisation.') # self.assertEqual(r['errors'][1]['message'], 'Invalid Tag. This tag can only be set by a fixed organisation.')
self.assertEqual(r['errors'][1]['message'], 'Invalid Target.') self.assertEqual(r['errors'][1]['message'], 'Invalid Target.')
r = self.user_misp_connector.tag(first, tag_org_restricted) r = self.user_misp_connector.tag(first, tag_org_restricted)
self.assertTrue('successfully' in r['message'].lower() and f'Event ({first.id})' in r['message'], r['message']) self.assertTrue('successfully' in r['message'].lower() and f'({first.id})' in r['message'], r['message'])
r = self.pub_misp_connector.tag(first.attributes[0], tag_user_restricted) r = self.pub_misp_connector.tag(first.attributes[0], tag_user_restricted)
self.assertIn('Invalid Tag. This tag can only be set by a fixed user.', r['errors'][1]['errors']) self.assertIn('Invalid Tag. This tag can only be set by a fixed user.', r['errors'][1]['errors'])
r = self.user_misp_connector.tag(first.attributes[0], tag_user_restricted) r = self.user_misp_connector.tag(first.attributes[0], tag_user_restricted)
self.assertTrue('successfully' in r['message'].lower() and f'Attribute ({first.attributes[0].id})' in r['message'], r['message']) self.assertTrue('successfully' in r['message'].lower() and f'({first.attributes[0].id})' in r['message'], r['message'])
first = self.user_misp_connector.get_event(first, pythonify=True) first = self.user_misp_connector.get_event(first, pythonify=True)
self.assertTrue(len(first.attributes[0].tags) == 1) self.assertTrue(len(first.attributes[0].tags) == 1)
# test delete tag on attribute edit # test delete tag on attribute edit
@ -2170,13 +2170,22 @@ class TestComprehensive(unittest.TestCase):
if feed.name == 'blockrules of rules.emergingthreats.net': if feed.name == 'blockrules of rules.emergingthreats.net':
e_thread_csv_feed = feed e_thread_csv_feed = feed
break break
e_thread_csv_feed.enabled = True
updated_feed = self.admin_misp_connector.enable_feed(e_thread_csv_feed, pythonify=True) updated_feed = self.admin_misp_connector.enable_feed(e_thread_csv_feed, pythonify=True)
self.assertTrue(updated_feed.enabled)
self.assertEqual(updated_feed.settings, e_thread_csv_feed.settings) self.assertEqual(updated_feed.settings, e_thread_csv_feed.settings)
e_thread_csv_feed.enabled = False
updated_feed = self.admin_misp_connector.disable_feed(e_thread_csv_feed, pythonify=True) updated_feed = self.admin_misp_connector.disable_feed(e_thread_csv_feed, pythonify=True)
self.assertFalse(updated_feed.enabled)
self.assertEqual(updated_feed.settings, e_thread_csv_feed.settings) self.assertEqual(updated_feed.settings, e_thread_csv_feed.settings)
# Test partial update # Test partial update
updated_feed = self.admin_misp_connector.enable_feed(e_thread_csv_feed.id, pythonify=True) updated_feed = self.admin_misp_connector.enable_feed(e_thread_csv_feed.id, pythonify=True)
self.assertTrue(updated_feed.enabled)
self.assertEqual(updated_feed.settings, e_thread_csv_feed.settings)
updated_feed = self.admin_misp_connector.disable_feed(e_thread_csv_feed.id, pythonify=True)
self.assertFalse(updated_feed.enabled)
self.assertEqual(updated_feed.settings, e_thread_csv_feed.settings) self.assertEqual(updated_feed.settings, e_thread_csv_feed.settings)
def test_servers(self): def test_servers(self):