Test all functions

vstinner · vstinner · commit aae4db4ee2e4 · 2020-06-04T22:40:53.000+02:00
run_tests now displays the number of tests.
diff --git a/tests/run_tests.py b/tests/run_tests.py
@@ -63,13 +63,10 @@ def import_tests():
     return test_pythoncapi_compat
 
 
-def _run_tests(testmod, verbose):
-    for name in dir(testmod):
-        if not name.startswith("test"):
-            continue
+def _run_tests(tests, verbose):
+    for name, test_func in tests:
         if verbose:
             print(f"{name}()", flush=True)
-        test_func = getattr(testmod, name)
         test_func()
 
 
@@ -88,8 +85,12 @@ def run_tests(testmod):
 
     check_refleak = hasattr(sys, 'gettotalrefcount')
 
+    tests = [(name, getattr(testmod, name))
+             for name in dir(testmod)
+             if name.startswith("test")]
+
     def test_func():
-        _run_tests(testmod, VERBOSE)
+        _run_tests(tests, VERBOSE)
 
     if check_refleak:
         _check_refleak(test_func)
@@ -101,7 +102,8 @@ def test_func():
 
     ver = sys.version_info
     build = 'debug' if hasattr(sys, 'gettotalrefcount') else 'release'
-    msg = f"Python {ver.major}.{ver.minor} ({build} build): TESTS OK!"
+    msg = f"{len(tests)} tests succeeded!"
+    msg = f"Python {ver.major}.{ver.minor} ({build} build): {msg}"
     if check_refleak:
         msg = f"{msg} (no reference leak detected)"
     print(msg)
diff --git a/tests/test_pythoncapi_compat.c b/tests/test_pythoncapi_compat.c
@@ -1,8 +1,3 @@
-// FIXME: test PyObject_CallNoArgs()
-// FIXME: test PyModule_AddType()
-// FIXME: test PyObject_GC_IsTracked()
-// FIXME: test PyObject_GC_IsFinalized()
-
 // Always enable assertions
 #undef NDEBUG
 
@@ -103,11 +98,82 @@ test_interpreter(PyObject *self, PyObject *ignored)
 }
 
 
+static PyObject *
+test_calls(PyObject *self, PyObject *ignored)
+{
+    PyObject *func = (PyObject *)&PyUnicode_Type;
+
+    // test PyObject_CallNoArgs(): str() returns an empty string
+    PyObject *res = PyObject_CallNoArgs(func);
+    if (res == NULL) {
+        return NULL;
+    }
+    assert(PyUnicode_Check(res));
+    Py_DECREF(res);
+
+    Py_RETURN_NONE;
+}
+
+
+static PyObject *
+test_gc(PyObject *self, PyObject *ignored)
+{
+    PyObject *tuple = PyTuple_New(1);
+    Py_INCREF(Py_None);
+    PyTuple_SET_ITEM(tuple, 0, Py_None);
+
+    // test PyObject_GC_IsTracked()
+    int tracked = PyObject_GC_IsTracked(tuple);
+    assert(tracked);
+
+    // test PyObject_GC_IsFinalized()
+    int finalized = PyObject_GC_IsFinalized(tuple);
+    assert(!finalized);
+
+    Py_DECREF(tuple);
+    Py_RETURN_NONE;
+}
+
+
+static PyObject *
+test_module(PyObject *self, PyObject *ignored)
+{
+    PyObject *module = self;
+    assert(PyModule_Check(module));
+
+    // test PyModule_AddType()
+    PyTypeObject *type = &PyUnicode_Type;
+    Py_ssize_t refcnt = Py_REFCNT(type);
+
+    if (PyModule_AddType(module, type) < 0) {
+        return NULL;
+    }
+    assert(Py_REFCNT(type) == refcnt + 1);
+
+    PyObject *attr = PyObject_GetAttrString(module, "str");
+    if (attr == NULL) {
+        return NULL;
+    }
+    assert(attr == (PyObject *)type);
+    Py_DECREF(attr);
+
+    if (PyObject_DelAttrString(module, "str") < 0) {
+        return NULL;
+    }
+    assert(Py_REFCNT(type) == refcnt);
+
+    Py_RETURN_NONE;
+}
+
+
 static struct PyMethodDef methods[] = {
     {"test_set_funcs", test_set_funcs, METH_NOARGS},
     {"test_frame", test_frame, METH_NOARGS},
     {"test_thread_state", test_thread_state, METH_NOARGS},
     {"test_interpreter", test_interpreter, METH_NOARGS},
+    {"test_calls", test_calls, METH_NOARGS},
+    {"test_gc", test_gc, METH_NOARGS},
+    {"test_module", test_module, METH_NOARGS},
     {NULL, NULL}
 };
 
