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

Solved warnings in tests when run under Python3

pull/31/head
morallo 2016-12-02 16:53:45 +01:00
parent 31cf37fa02
commit a6a851f38d
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pymisp/mispevent.py
View File

@ -216,8 +216,10 @@ class MISPEvent(object):
def __init__(self, describe_types=None): def __init__(self, describe_types=None):
self.ressources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data') self.ressources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'data')
self.json_schema = json.load(open(os.path.join(self.ressources_path, 'schema.json'), 'r')) with open(os.path.join(self.ressources_path, 'schema.json', 'r') as f:
self.json_schema_lax = json.load(open(os.path.join(self.ressources_path, 'schema-lax.json'), 'r')) self.json_schema = json.load(f)
with open(os.path.join(self.ressources_path, 'schema-lax.json'), 'r') as f:
self.json_schema_lax = json.load(f)
if not describe_types: if not describe_types:
t = json.load(open(os.path.join(self.ressources_path, 'describeTypes.json'), 'r')) t = json.load(open(os.path.join(self.ressources_path, 'describeTypes.json'), 'r'))
describe_types = t['result'] describe_types = t['result']

18
tests/test_offline.py
View File

@ -21,15 +21,20 @@ class TestOffline(unittest.TestCase):
self.maxDiff = None self.maxDiff = None
self.domain = 'http://misp.local/' self.domain = 'http://misp.local/'
self.key = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' self.key = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
self.event = {'Event': json.load(open('tests/misp_event.json', 'r'))} with open('tests/misp_event.json', 'r') as f:
self.new_misp_event = {'Event': json.load(open('tests/new_misp_event.json', 'r'))} self.event = {'Event': json.load(f)}
with open('tests/new_misp_event.json', 'r') as f:
self.new_misp_event = {'Event': json.load(f)}
self.ressources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../pymisp/data') self.ressources_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../pymisp/data')
self.types = json.load(open(os.path.join(self.ressources_path, 'describeTypes.json'), 'r')) with open(os.path.join(self.ressources_path, 'describeTypes.json'), 'r') as f:
self.sharing_groups = json.load(open('tests/sharing_groups.json', 'r')) self.types = json.load(f)
with open('tests/sharing_groups.json', 'r') as f:
self.sharing_groups = json.load(f)
self.auth_error_msg = {"name": "Authentication failed. Please make sure you pass the API key of an API enabled user along in the Authorization header.", self.auth_error_msg = {"name": "Authentication failed. Please make sure you pass the API key of an API enabled user along in the Authorization header.",
"message": "Authentication failed. Please make sure you pass the API key of an API enabled user along in the Authorization header.", "message": "Authentication failed. Please make sure you pass the API key of an API enabled user along in the Authorization header.",
"url": "\/events\/1"} "url": "\/events\/1"}
self.search_index_result = json.load(open('tests/search_index_result.json', 'r')) with open('tests/search_index_result.json', 'r') as f:
self.search_index_result = json.load(f)
def initURI(self, m): def initURI(self, m):
m.register_uri('GET', self.domain + 'events/1', json=self.auth_error_msg, status_code=403) m.register_uri('GET', self.domain + 'events/1', json=self.auth_error_msg, status_code=403)
@ -124,7 +129,8 @@ class TestOffline(unittest.TestCase):
self.initURI(m) self.initURI(m)
pymisp = PyMISP(self.domain, self.key) pymisp = PyMISP(self.domain, self.key)
misp_event = MISPEvent(pymisp.describe_types) misp_event = MISPEvent(pymisp.describe_types)
misp_event.load(open('tests/57c4445b-c548-4654-af0b-4be3950d210f.json', 'r').read()) with open('tests/57c4445b-c548-4654-af0b-4be3950d210f.json', 'r') as f:
misp_event.load(f.read())
json.dumps(misp_event, cls=EncodeUpdate) json.dumps(misp_event, cls=EncodeUpdate)
json.dumps(misp_event, cls=EncodeFull) json.dumps(misp_event, cls=EncodeFull)