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

GH-188: Fixes for old Python syntax.

stix2.0
Greg Back 2018-06-27 12:49:00 -05:00
parent d2f703b9d0
commit a2e2407025
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stix2/test/test_properties.py
View File

@ -99,7 +99,7 @@ def test_id_property_valid(value):
assert ID_PROP.clean(value) == value assert ID_PROP.clean(value) == value
@pytest.mark.parametrize("value", [ CONSTANT_IDS = [
constants.ATTACK_PATTERN_ID, constants.ATTACK_PATTERN_ID,
constants.CAMPAIGN_ID, constants.CAMPAIGN_ID,
constants.COURSE_OF_ACTION_ID, constants.COURSE_OF_ACTION_ID,
@ -115,11 +115,14 @@ def test_id_property_valid(value):
constants.THREAT_ACTOR_ID, constants.THREAT_ACTOR_ID,
constants.TOOL_ID, constants.TOOL_ID,
constants.VULNERABILITY_ID, constants.VULNERABILITY_ID,
*constants.MARKING_IDS, ]
*constants.RELATIONSHIP_IDS, CONSTANT_IDS.extend(constants.MARKING_IDS)
]) CONSTANT_IDS.extend(constants.RELATIONSHIP_IDS)
@pytest.mark.parametrize("value", CONSTANT_IDS)
def test_id_property_valid_for_type(value): def test_id_property_valid_for_type(value):
type = value.split('--', maxsplit=1)[0] type = value.split('--', 1)[0]
assert IDProperty(type=type).clean(value) == value assert IDProperty(type=type).clean(value) == value