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

Add test for UnableToRevertMachinetag

pull/3/head
Raphaël Vinot 2017-07-26 17:06:44 +02:00
parent d146ebba88
commit b4ba8dcf84
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pymispgalaxies/__init__.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from .api import Galaxies, Clusters, EncodeGalaxies from .api import Galaxies, Clusters, EncodeGalaxies, UnableToRevertMachinetag

2
pymispgalaxies/api.py
View File

@ -244,8 +244,8 @@ class Clusters(collections.Mapping):
return [cluster.machinetags() for cluster in self.values()] return [cluster.machinetags() for cluster in self.values()]
def revert_machinetag(self, machinetag): def revert_machinetag(self, machinetag):
_, cluster_type, cluster_value = re.findall('^([^:]*):([^=]*)="([^"]*)"$', machinetag)[0]
try: try:
_, cluster_type, cluster_value = re.findall('^([^:]*):([^=]*)="([^"]*)"$', machinetag)[0]
cluster = self.get(cluster_type) cluster = self.get(cluster_type)
value = cluster[cluster_value] value = cluster[cluster_value]
return cluster, value return cluster, value

4
tests/tests.py
View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import unittest import unittest
from pymispgalaxies import Galaxies, Clusters from pymispgalaxies import Galaxies, Clusters, UnableToRevertMachinetag
from glob import glob from glob import glob
import os import os
import json import json
@ -59,6 +59,8 @@ class TestPyMISPGalaxies(unittest.TestCase):
def test_revert_machinetag(self): def test_revert_machinetag(self):
self.assertEqual(len(self.clusters.revert_machinetag('misp-galaxy:tool="Babar"')), 2) self.assertEqual(len(self.clusters.revert_machinetag('misp-galaxy:tool="Babar"')), 2)
with self.assertRaises(UnableToRevertMachinetag):
self.clusters.revert_machinetag('blah')
def test_len(self): def test_len(self):
self.assertIsNot(len(self.clusters), 0) self.assertIsNot(len(self.clusters), 0)