Merge pull request #81 from imbillow/ci

FIx #80 and  fix compatibility with python2.7

Author: williballenthin

.github/workflows/main.yml

@@ -33,5 +33,9 @@ jobs:
       - name: Run tests
         shell: bash
         run: |
+          set -e
           find . -name \*.py -exec pycodestyle --ignore=E501 {} \;
-          find . -name test\*py -exec py.test {} -v --cov=idb \;
+          for f in $(find . -name test\*py)
+          do
+            py.test -v --cov=idb $f
+          done

idb/analysis.py

@@ -829,7 +829,7 @@ def procName(self):
     def vsParse(self, sbytes, offset=0, fast=False):
         self.sbytes = sbytes
         self.len_sbytes = len(sbytes)
-        return super().vsParse(sbytes, offset, fast)
+        return vstruct.VStruct.vsParse(self, sbytes, offset, fast)
 
 
 Root = Analysis(

tests/conftest.py

@@ -1,4 +1,22 @@
+import pytest
+
+
 def pytest_addoption(parser):
     parser.addoption("--runslow", action="store_true", help="run slow tests")
 
     parser.addoption("--rundebug", action="store_true", help="run debug tests")
+
+
+# from https://docs.pytest.org/en/latest/example/simple.html#control-skipping-of-tests-according-to-command-line-option
+def pytest_configure(config):
+    config.addinivalue_line("markers", "slow: mark test as slow to run")
+
+
+def pytest_collection_modifyitems(config, items):
+    if config.getoption("--runslow"):
+        # --runslow given in cli: do not skip slow tests
+        return
+    skip_slow = pytest.mark.skip(reason="need --runslow option to run")
+    for item in items:
+        if "slow" in item.keywords:
+            item.add_marker(skip_slow)

tests/test_idaapi.py

@@ -5,8 +5,6 @@
 
 import idb
 
-slow = pytest.mark.skipif(not runslow, reason="need --runslow option to run")
-
 
 def pluck(prop, s):
     """
@@ -545,7 +543,7 @@ def test_function_names(kernel32_idb, version, bitness, expected):
         _ = api.idc.GetFunctionName(0x689018E5)
 
 
-@slow
+@pytest.mark.slow
 @kern32_test()
 def test_all_function_names(kernel32_idb, version, bitness, expected):
     api = idb.IDAPython(kernel32_idb)
@@ -573,7 +571,7 @@ def test_comments(kernel32_idb, version, bitness, expected):
     assert api.idc.GetCommentEx(0x689023B4, True) == "jumptable 6892FF97 default case"
 
 
-@slow
+@pytest.mark.slow
 @kern32_test(
     [
         (695, 32, (13369, 283)),

tests/test_idb.py

@@ -6,8 +6,6 @@
 import idb.fileformat
 import idb.netnode
 
-slow = pytest.mark.skipif(not runslow, reason="need --runslow option to run")
-
 
 def h2b(somehex):
     """
@@ -449,7 +447,7 @@ def test_cursor_complex_leaf_prev(kernel32_idb, version, bitness, expected):
     assert b2h(cursor.key) == "2eff00002253689bea8e"
 
 
-@slow
+@pytest.mark.slow
 @kern32_test()
 def test_cursor_enum_all_asc(kernel32_idb, version, bitness, expected):
     minkey = kernel32_idb.id0.get_min().key
@@ -465,7 +463,7 @@ def test_cursor_enum_all_asc(kernel32_idb, version, bitness, expected):
     assert kernel32_idb.id0.record_count == count
 
 
-@slow
+@pytest.mark.slow
 @kern32_test()
 def test_cursor_enum_all_desc(kernel32_idb, version, bitness, expected):
     maxkey = kernel32_idb.id0.get_max().key