gitea-mirror/capa
1
0
Fork 0
mirror of https://github.com/mandiant/capa.git synced 2025-12-22 15:16:22 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: freeze: make py3 compatible

Browse Source
This commit is contained in:
William Ballenthin
2020-08-16 00:05:04 -06:00
parent d7f1c23f4d
commit c032d556fb
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_freeze.py
View File

@@ -104,17 +104,14 @@ def compare_extractors_viv_null(viv_ext, null_ext):
viv_ext (capa.features.extractors.viv.VivisectFeatureExtractor) viv_ext (capa.features.extractors.viv.VivisectFeatureExtractor)
null_ext (capa.features.extractors.NullFeatureExtractor) null_ext (capa.features.extractors.NullFeatureExtractor)
""" """
# TODO: ordering of these things probably doesn't work yet
assert list(viv_ext.extract_file_features()) == list(null_ext.extract_file_features()) assert list(viv_ext.extract_file_features()) == list(null_ext.extract_file_features())
assert to_int(list(viv_ext.get_functions())) == list(null_ext.get_functions()) assert list(map(to_int, viv_ext.get_functions())) == list(null_ext.get_functions())
for f in viv_ext.get_functions(): for f in viv_ext.get_functions():
assert to_int(list(viv_ext.get_basic_blocks(f))) == list(null_ext.get_basic_blocks(to_int(f))) assert list(map(to_int, viv_ext.get_basic_blocks(f))) == list(null_ext.get_basic_blocks(to_int(f)))
assert list(viv_ext.extract_function_features(f)) == list(null_ext.extract_function_features(to_int(f))) assert list(viv_ext.extract_function_features(f)) == list(null_ext.extract_function_features(to_int(f)))
for bb in viv_ext.get_basic_blocks(f): for bb in viv_ext.get_basic_blocks(f):
assert to_int(list(viv_ext.get_instructions(f, bb))) == list( assert list(map(to_int, viv_ext.get_instructions(f, bb))) == list(
null_ext.get_instructions(to_int(f), to_int(bb)) null_ext.get_instructions(to_int(f), to_int(bb))
) )
assert list(viv_ext.extract_basic_block_features(f, bb)) == list( assert list(viv_ext.extract_basic_block_features(f, bb)) == list(
@@ -129,9 +126,6 @@ def compare_extractors_viv_null(viv_ext, null_ext):
def to_int(o): def to_int(o):
"""helper to get int value of extractor items""" """helper to get int value of extractor items"""
if isinstance(o, list):
return map(lambda x: capa.helpers.oint(x), o)
else:
return capa.helpers.oint(o) return capa.helpers.oint(o)