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

Merge pull request #162 from oasis-open/tox-fix 

Improve Tox test harness
stix2.0
Greg Back 2018-04-12 08:49:35 -05:00 committed by GitHub
parent 76f1474a8b 3e048ef325
commit 2d689815d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stix2/test/test_external_reference.py
View File

@ -42,7 +42,7 @@ def test_external_reference_capec():
) )
assert str(ref) == CAPEC assert str(ref) == CAPEC
assert re.match("ExternalReference\(source_name=u?'capec', external_id=u?'CAPEC-550'\)", repr(ref)) assert re.match("ExternalReference\\(source_name=u?'capec', external_id=u?'CAPEC-550'\\)", repr(ref))
CAPEC_URL = """{ CAPEC_URL = """{
@ -109,7 +109,7 @@ def test_external_reference_offline():
) )
assert str(ref) == OFFLINE assert str(ref) == OFFLINE
assert re.match("ExternalReference\(source_name=u?'ACME Threat Intel', description=u?'Threat report'\)", repr(ref)) assert re.match("ExternalReference\\(source_name=u?'ACME Threat Intel', description=u?'Threat report'\\)", repr(ref))
# Yikes! This works # Yikes! This works
assert eval("stix2." + repr(ref)) == ref assert eval("stix2." + repr(ref)) == ref

2
stix2/test/test_malware.py
View File

@ -126,7 +126,7 @@ def test_parse_malware(data):
def test_parse_malware_invalid_labels(): def test_parse_malware_invalid_labels():
data = re.compile('\[.+\]', re.DOTALL).sub('1', EXPECTED_MALWARE) data = re.compile('\\[.+\\]', re.DOTALL).sub('1', EXPECTED_MALWARE)
with pytest.raises(ValueError) as excinfo: with pytest.raises(ValueError) as excinfo:
stix2.parse(data) stix2.parse(data)
assert "Invalid value for Malware 'labels'" in str(excinfo.value) assert "Invalid value for Malware 'labels'" in str(excinfo.value)

4
stix2/test/test_pattern_expressions.py
View File

@ -319,13 +319,13 @@ def test_invalid_binary_constant():
def test_escape_quotes_and_backslashes(): def test_escape_quotes_and_backslashes():
exp = stix2.MatchesComparisonExpression("file:name", exp = stix2.MatchesComparisonExpression("file:name",
"^Final Report.+\.exe$") "^Final Report.+\\.exe$")
assert str(exp) == "file:name MATCHES '^Final Report.+\\\\.exe$'" assert str(exp) == "file:name MATCHES '^Final Report.+\\\\.exe$'"
def test_like(): def test_like():
exp = stix2.LikeComparisonExpression("directory:path", exp = stix2.LikeComparisonExpression("directory:path",
"C:\Windows\%\\foo") "C:\\Windows\\%\\foo")
assert str(exp) == "directory:path LIKE 'C:\\\\Windows\\\\%\\\\foo'" assert str(exp) == "directory:path LIKE 'C:\\\\Windows\\\\%\\\\foo'"

21
tox.ini
View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py27,py34,py35,py36,pycodestyle,isort-check envlist = py27,py34,py35,py36,style,isort-check
[testenv] [testenv]
deps = deps =
@ -10,22 +10,17 @@ deps =
coverage coverage
taxii2-client taxii2-client
commands = commands =
py.test --ignore=stix2/test/test_workbench.py --cov=stix2 stix2/test/ --cov-report term-missing pytest --ignore=stix2/test/test_workbench.py --cov=stix2 stix2/test/ --cov-report term-missing
py.test stix2/test/test_workbench.py --cov=stix2 --cov-report term-missing --cov-append pytest stix2/test/test_workbench.py --cov=stix2 --cov-report term-missing --cov-append
passenv = CI TRAVIS TRAVIS_* passenv = CI TRAVIS TRAVIS_*
[testenv:pycodestyle] [testenv:style]
deps = deps =
flake8 flake8
pycodestyle
commands = commands =
pycodestyle ./stix2
flake8 flake8
[pycodestyle]
max-line-length=160
[flake8] [flake8]
max-line-length=160 max-line-length=160
@ -37,7 +32,7 @@ commands =
[travis] [travis]
python = python =
2.7: py27, pycodestyle 2.7: py27, style
3.4: py34, pycodestyle 3.4: py34, style
3.5: py35, pycodestyle 3.5: py35, style
3.6: py36, pycodestyle 3.6: py36, style