rework testing under pytest & tox

Author: neok-m4700

.github/workflows/setup_test.yml

@@ -16,10 +16,13 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install tox
+    - name: Install tox and pytest
       run: |
         python -m pip install --upgrade pip
-        pip install tox
+        pip install tox pytest
     - name: Test with tox
       run: |
         tox
+    - name: Test with pytest
+      run: |
+        pytest

MANIFEST.in

@@ -22,7 +22,7 @@ include setup_cptrace.py
 
 # Tests
 include runtests.py
-include test_doc.py
+include check_doc.py
 include tests/test_*.py
 include tests/crash/*.c
 include tests/crash/BSDmakefile

test_doc.py check_doc.pytest_doc.py renamed to check_doc.py

@@ -2,6 +2,7 @@
 from doctest import testfile, ELLIPSIS, testmod
 from sys import exit, path as sys_path
 from os.path import dirname
+import importlib
 
 
 def testDoc(filename, name=None):
@@ -13,17 +14,9 @@ def testDoc(filename, name=None):
     print("--- %s: End of tests" % filename)
 
 
-def importModule(name):
-    mod = __import__(name)
-    components = name.split('.')
-    for comp in components[1:]:
-        mod = getattr(mod, comp)
-    return mod
-
-
 def testModule(name):
     print("--- Test module %s" % name)
-    module = importModule(name)
+    module = importlib.import_module(name)
     failure, nb_test = testmod(module)
     if failure:
         exit(1)

doc/install.rst

@@ -84,7 +84,7 @@ Run tests manually
 Type::
 
     python3 runtests.py
-    python3 test_doc.py
+    python3 check_doc.py
 
 It's also possible to run a specific test::
 

tests/crash/run.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+trace() {
+  (
+    set +e
+    python ../../strace.py -e execve $1; ec=$?
+    if [ $ec -gt 0 ]; then
+      exit $(($ec - 128 - $2))
+    fi
+  )
+}
+
+if command -v gcc && command -v make && command -v kill; then
+  make || exit
+
+  # trace ./invalid_read  $(kill -l SEGV) |& tee /dev/stderr | grep -q 'Invalid read from'
+  trace ./invalid_read    $(kill -l SEGV)  # 2>&1 | grep -q 'Invalid read from'
+  trace ./invalid_write   $(kill -l SEGV)  # 2>&1 | grep -q 'Invalid write to'
+  trace ./stack_overflow  $(kill -l SEGV)  # 2>&1 | grep -q 'STACK OVERFLOW!'
+  trace ./call_null       $(kill -l SEGV)
+  trace ./abort           $(kill -l ABRT)
+  trace ./div_zero        $(kill -l FPE)
+  trace ./socket_ipv4_tcp
+  trace ./pthread
+  trace ./execve
+  trace ./fork
+fi

tests/crash/stack_overflow.c

@@ -1,7 +1,8 @@
 char toto()
 {
-    char buffer[4096];
-    buffer[0] = 0;
+    volatile unsigned char buffer[4096];
+    buffer[0] = 1;
+    buffer[4095] = 0;
     toto();
     return buffer[0] + buffer[sizeof(buffer)-1];
 }

tests/test_strace.py

@@ -6,12 +6,16 @@
 import tempfile
 import unittest
 import signal
+import shutil
+import platform
 
 STRACE = os.path.normpath(
     os.path.join(os.path.dirname(__file__), '..', 'strace.py'))
 
 AARCH64 = (getattr(os.uname(), 'machine', None) == 'aarch64')
 
+UNTESTED = platform.system() not in ('Linux', 'FreeBSD')
+
 
 class TestStrace(unittest.TestCase):
     def strace(self, *args):
@@ -106,6 +110,13 @@ def test_socket(self):
             "import socket; socket.socket(socket.AF_INET,socket.SOCK_STREAM).close()",
             br'^socket\(AF_INET, SOCK_STREAM(\|SOCK_CLOEXEC)?')
 
+    @unittest.skipIf(UNTESTED, 'Untested system/OS')
+    def test_crash(self):
+        dn = os.path.join(os.path.dirname(__file__), 'crash')
+        shell = shutil.which('bash')
+        if shell:
+            self.assertEqual(subprocess.call([shell, '-e', 'run.sh'], cwd=dn), 0)
+
 
 if __name__ == "__main__":
     unittest.main()

tox.ini

@@ -4,7 +4,7 @@ envlist = py3, pep8
 [testenv]
 basepython = python3
 commands=
-    python test_doc.py
+    python check_doc.py
     python runtests.py -v
 
 [testenv:py3]
@@ -13,7 +13,7 @@ basepython = python3
 [testenv:pep8]
 deps = flake8
 commands =
-    flake8 ptrace/ tests/ gdb.py runtests.py setup_cptrace.py setup.py strace.py SYSCALL_PROTOTYPES.codegen.py test_doc.py
+    flake8 ptrace/ tests/ gdb.py runtests.py setup_cptrace.py setup.py strace.py SYSCALL_PROTOTYPES.codegen.py check_doc.py
 
 [flake8]
 # E501 line too long (88 > 79 characters)