Merge branch 'master' of github.com:CIRCL/PyMISP

pull/25/head
Raphaël Vinot 2016-08-11 17:46:15 +02:00
commit 9ec4dec9f4
1 changed files with 6 additions and 5 deletions

View File

@ -1,5 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
from __future__ import print_function
from pymisp import PyMISP
from keys import url, key
@ -47,7 +48,7 @@ class TestBasic(unittest.TestCase):
u'Org': {u'name': u'ORGNAME'},
u'Orgc': {u'name': u'ORGNAME'},
u'threat_level_id': u'1'}}
print event
print(event)
self.assertEqual(event, to_check, 'Failed at creating a new Event')
return int(event_id)
@ -99,15 +100,15 @@ class TestBasic(unittest.TestCase):
def delete(self, eventid):
event = self.misp.delete_event(eventid)
print event.json()
print(event.json())
def delete_attr(self, attrid):
event = self.misp.delete_attribute(attrid)
print event.json()
print(event.json())
def get(self, eventid):
event = self.misp.get_event(eventid)
print event.json()
print(event.json())
def get_stix(self, **kwargs):
event = self.misp.get_stix(kwargs)
@ -129,7 +130,7 @@ class TestBasic(unittest.TestCase):
u'ShadowAttribute': [], u'distribution': u'2', u'type': u'filename|sha256'}],
u'proposal_email_lock': False, u'threat_level_id': u'1'}}
event = self.misp.add_event(event)
print event.json()
print(event.json())
def test_create_event(self):
eventid = self.new_event()