refactor unittests through helper

serhiy-storchaka · Apr 17, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024 · Mar 12, 2024
commit 806d21c2c2855cb131525351fd5684c92dd26019
diff --git a/Lib/test/test_capi/test_pyrun.py b/Lib/test/test_capi/test_pyrun.py
@@ -1,15 +1,43 @@
-import unittest
+import unittest, os
 from test.support import import_helper
 
 # Skip this test if the _testcapi module isn't available.
 _testcapi = import_helper.import_module('_testcapi')
 
-class PyRunTests(unittest.TestCase):
-    pass
+NULL = None
+Py_single_input = _testcapi.Py_single_input
+Py_file_input = _testcapi.Py_file_input
+Py_eval_input = _testcapi.Py_eval_input
 
-for name in sorted(dir(_testcapi)):
-    if name.startswith('test_pyrun'):
-        setattr(PyRunTests, name, getattr(_testcapi, name))
+class PyRunTest(unittest.TestCase):
+
+    # create file
+    def __init__(self, *args, **kwargs):
+        self.filename = "pyrun_fileexflags_sample.py"
+        with open(self.filename, 'w') as fp:
+            fp.write("import sysconfig\n\nconfig = sysconfig.get_config_vars()\n")
+            fp.close()
+            unittest.TestCase.__init__(self, *args, **kwargs)
+
+    # delete file
+    def __del__(self):
+        os.remove(self.filename)
+
+    # test function args:
+    # filename -- filename to run script from
+    # start -- Py_single_input, Py_file_input, Py_eval_input
+    # globals -- dict
+    # locals -- mapping (dict)
+    # closeit -- whether close file or not true/false
+    # cf_flags -- compile flags bitmap
+    # cf_feature_version -- compile flags feature version
+    def test_pyrun_fileexflags_with_differents_args(self):
+
+        self.assertIsNone(_testcapi.eval_pyrun_fileexflags(self.filename, Py_file_input, {}, NULL, 1, 0, 0))
+        self.assertIsNone(_testcapi.eval_pyrun_fileexflags(self.filename, Py_file_input, {}, {}, 1, 0, 0))
+        self.assertIsNone(_testcapi.eval_pyrun_fileexflags(self.filename, Py_file_input, {}, {}, 0, 0, 0))
+        self.assertRaises(SystemError, _testcapi.eval_pyrun_fileexflags, self.filename, Py_file_input, NULL, NULL, 1, 0, 0)
+        self.assertRaises(SystemError, _testcapi.eval_pyrun_fileexflags, self.filename, Py_file_input, NULL, {}, 1, 0, 0)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Modules/_testcapi/pyrun.c b/Modules/_testcapi/pyrun.c
@@ -1,134 +1,96 @@
-//#include <unistd.h>
-//#include <stdio.h>
 #include "parts.h"
+#include "util.h"
+
+#include <stdio.h>
+#include <errno.h>
 
 char *filename = "pyrun_sample.py";
 
-static FILE *create_tempscript(void) {
-    FILE *fp;
-    const char *script = "import sysconfig\n\nconfig = sysconfig.get_config_vars()\n";
+/* XXX: Need to implement
+int PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit, PyCompilerFlags *flags)
+int PyRun_SimpleStringFlags(const char *command, PyCompilerFlags *flags)
+int PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit, PyCompilerFlags *flags)
+int PyRun_InteractiveOneFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
+int PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
+PyObject *PyRun_StringFlags(const char *str, int start, PyObject *globals, PyObject *locals, PyCompilerFlags *flags)
 
-    fp = tmpfile();
-    if (fp == NULL) {
-        PyErr_SetString(PyExc_LookupError, "tmpname");
-        return NULL;
-    }
-    fprintf(fp, script);
-    rewind(fp);
+XXX: implemented
+PyObject *PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals, PyObject *locals, int closeit, PyCompilerFlags *flags)
+*/
 
-    return fp;
-}
 
 static PyObject *
-test_pyrun_fileex(PyObject *self, PyObject *Py_UNUSED(ignored))
+eval_pyrun_fileexflags(PyObject *mod, PyObject *pos_args)
 {
-    PyObject *pdict, *pResult;
-    FILE *fp;
-
-    pdict = PyDict_New();
-    if (pdict == NULL) {
-        assert(PyErr_ExceptionMatches(PyExc_MemoryError));
-        return NULL;
+    PyObject *result = NULL;
+    const char *filename = NULL;
+    int start;
+    PyObject *globals = NULL;
+    PyObject *locals = NULL;
+    int closeit = 1;
+    PyCompilerFlags flags = _PyCompilerFlags_INIT;
+    PyCompilerFlags *pflags = NULL;
+    int cf_flags = 0;
+    int cf_feature_version = 0;
+    int fn;
+
+    FILE *fp = NULL;
+
+    if (!PyArg_ParseTuple(pos_args,
+                        "ziO|Oiii:eval_pyrun_fileexflags",
+                        &filename,
+                        &start,
+                        &globals,
+                        &locals,
+                        &closeit,
+                        &cf_flags,
+                        &cf_feature_version)) {
+        goto exit;
     }
 
-    fp = create_tempscript();
-    if (fp == NULL) {
-        return NULL;
+    NULLABLE(globals);
+    NULLABLE(locals);
+    if (cf_flags || cf_feature_version) {
+        flags.cf_flags = cf_flags;
+        flags.cf_feature_version = cf_feature_version;
+        pflags = &flags;
     }
 
-    pResult = PyRun_FileEx(fp, filename, Py_file_input, pdict, pdict, 1);
-    if (pResult == NULL) {
-        return NULL;
+    if (globals && !PyDict_Check(globals)) {
+        PyErr_SetString(PyExc_TypeError, "globals must be a dict");
+        goto exit;
     }
 
-    Py_RETURN_NONE;
-}
-
-static PyObject *
-test_pyrun_fileex_null_locals(PyObject *self, PyObject *Py_UNUSED(ignored))
-{
-    PyObject *pdict, *pResult;
-    FILE *fp;
-
-    pdict = PyDict_New();
-    if (pdict == NULL) {
-        assert(PyErr_ExceptionMatches(PyExc_MemoryError));
-        return NULL;
+    if (locals && !PyMapping_Check(locals)) {
+        PyErr_SetString(PyExc_TypeError, "locals must be a mapping");
+        goto exit;
     }
 
-    fp = create_tempscript();
+    fp = fopen(filename, "r");
     if (fp == NULL) {
-        return NULL;
+        PyErr_SetFromErrnoWithFilename(PyExc_OSError, filename);
+        goto exit;
     }
 
-    pResult = PyRun_FileEx(fp, filename, Py_file_input, pdict, NULL, 1);
-    if (pResult == NULL) {
-        return NULL;
-    }
+    result = PyRun_FileExFlags(fp, filename, start, globals, locals, closeit, pflags);
 
-    Py_RETURN_NONE;
-}
-
-static PyObject *
-test_pyrun_fileex_null_globals(PyObject *self, PyObject *Py_UNUSED(ignored))
-{
-    PyObject *pdict, *pResult, *exc;
-    FILE *fp;
-    char *filename = "pyrun_sample.py";
-
-    pdict = PyDict_New();
-    if (pdict == NULL) {
-        assert(PyErr_ExceptionMatches(PyExc_MemoryError));
-        return NULL;
-    }
-
-    fp = create_tempscript();
-    if (fp == NULL) {
-        return NULL;
-    }
-
-    pResult = PyRun_FileEx(fp, filename, Py_file_input, NULL, pdict, 1);
-
-    exc = PyErr_GetRaisedException();
-    assert(exc);
-    assert(PyErr_GivenExceptionMatches(exc, PyExc_SystemError));
-    PyErr_Clear();
-
-    Py_RETURN_NONE;
-}
-
-static PyObject *
-test_pyrun_fileex_null_globals_locals(PyObject *self, PyObject *Py_UNUSED(ignored))
-{
-    PyObject *pdict, *pResult, *exc;
-    FILE *fp;
-    char *filename = "pyrun_sample.py";
-
-    pdict = PyDict_New();
-    if (pdict == NULL) {
-        assert(PyErr_ExceptionMatches(PyExc_MemoryError));
-        return NULL;
+    fn = fileno(fp);
+    if (closeit && fn > 0) {
+        PyErr_SetString(PyExc_SystemError, "File was not closed after excution");
+        goto exit;
     }
-
-    fp = create_tempscript();
-    if (fp == NULL) {
-        return NULL;
+    else if (!closeit && fn < 0) {
+        PyErr_SetString(PyExc_SystemError, "Bad file descriptor after excution");
+        goto exit;
     }
 
-    pResult = PyRun_FileEx(fp, filename, Py_file_input, NULL, NULL, 1);
-    exc = PyErr_GetRaisedException();
-    assert(exc);
-    assert(PyErr_GivenExceptionMatches(exc, PyExc_SystemError));
-    PyErr_Clear();
+exit:
 
-    Py_RETURN_NONE;
+    return result;
 }
 
 static PyMethodDef test_methods[] = {
-    {"test_pyrun_fileex", test_pyrun_fileex, METH_NOARGS},
-    {"test_pyrun_fileex_null_locals", test_pyrun_fileex_null_locals, METH_NOARGS},
-    {"test_pyrun_fileex_null_globals", test_pyrun_fileex_null_globals, METH_NOARGS},
-    {"test_pyrun_fileex_null_globals_locals", test_pyrun_fileex_null_globals_locals, METH_NOARGS},
+    {"eval_pyrun_fileexflags", eval_pyrun_fileexflags, METH_VARARGS},
     {NULL},
 };
 

diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
@@ -3951,6 +3951,10 @@ PyInit__testcapi(void)
     PyModule_AddIntConstant(m, "the_number_three", 3);
     PyModule_AddIntMacro(m, Py_C_RECURSION_LIMIT);
 
+    PyModule_AddIntConstant(m, "Py_single_input", Py_single_input);
+    PyModule_AddIntConstant(m, "Py_file_input", Py_file_input);
+    PyModule_AddIntConstant(m, "Py_eval_input", Py_eval_input);
+
     testcapistate_t *state = get_testcapi_state(m);
     state->error = PyErr_NewException("_testcapi.error", NULL, NULL);
     PyModule_AddObject(m, "error", state->error);