MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

Minor style changes.

stix2.1
Emmanuelle Vargas-Gonzalez 2017-08-23 13:12:40 -04:00
parent f33427328b
commit 8d4c1d55b5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stix2/test/test_granular_markings.py
View File

@ -1,7 +1,7 @@
import pytest import pytest
from stix2 import Malware, exceptions, markings from stix2 import Malware, markings
from .constants import FAKE_TIME, MALWARE_ID, MARKING_IDS from .constants import FAKE_TIME, MALWARE_ID, MARKING_IDS
from .constants import MALWARE_KWARGS as MALWARE_KWARGS_CONST from .constants import MALWARE_KWARGS as MALWARE_KWARGS_CONST

4
stix2/test/test_markings.py
View File

@ -155,8 +155,8 @@ def test_campaign_with_granular_markings_example():
marking_ref="marking-definition--613f2e26-407d-48c7-9eca-b8e91df99dc9", marking_ref="marking-definition--613f2e26-407d-48c7-9eca-b8e91df99dc9",
selectors=["description"]) selectors=["description"])
]) ])
print (markings.get_markings(campaign, None)) print(markings.get_markings(campaign, None))
print (markings.add_markings(campaign, None, "marking-definition--00000000-0000-0000-0000-000000000000")) print(markings.add_markings(campaign, None, "marking-definition--00000000-0000-0000-0000-000000000000"))
assert str(campaign) == EXPECTED_CAMPAIGN_WITH_GRANULAR_MARKINGS assert str(campaign) == EXPECTED_CAMPAIGN_WITH_GRANULAR_MARKINGS

6
stix2/test/test_object_markings.py
View File

@ -23,7 +23,7 @@ def test_add_markings_one_marking():
after = Malware( after = Malware(
object_marking_refs=[MARKING_IDS[0]], object_marking_refs=[MARKING_IDS[0]],
**MALWARE_KWARGS, **MALWARE_KWARGS
) )
before = markings.add_markings(before, None, MARKING_IDS[0]) before = markings.add_markings(before, None, MARKING_IDS[0])
@ -39,7 +39,7 @@ def test_add_markings_multiple_marking():
after = Malware( after = Malware(
object_marking_refs=[MARKING_IDS[0], MARKING_IDS[1]], object_marking_refs=[MARKING_IDS[0], MARKING_IDS[1]],
**MALWARE_KWARGS, **MALWARE_KWARGS
) )
before = markings.add_markings(before, None, [MARKING_IDS[0], MARKING_IDS[1]]) before = markings.add_markings(before, None, [MARKING_IDS[0], MARKING_IDS[1]])
@ -62,7 +62,7 @@ def test_add_markings_combination():
{ {
"selectors": ["name"], "selectors": ["name"],
"marking_ref": MARKING_IDS[3] "marking_ref": MARKING_IDS[3]
}, }
], ],
**MALWARE_KWARGS **MALWARE_KWARGS
) )