Enhance tests

Make sure that Py_RunMain() didn't call Py_Exit()

Author: vstinner

Include/errcode.h

@@ -6,7 +6,7 @@
 // the parser only returns E_EOF when it hits EOF immediately, and it
 // never returns E_OK.
 //
-// The public PyRun_InteractiveOneObjectEx() function can return E_EOF,
+// The public PyRun_InteractiveOneObject() function can return E_EOF,
 // same as its variants:
 //
 // * PyRun_InteractiveOneObject()

Lib/test/test_embed.py

@@ -597,24 +597,30 @@ def _nogil_filtered_err(err: str, mod_name: str) -> str:
         ]
         return "\n".join(filtered_err_lines)
 
+    def check_program_exitcode(self, *args, check_stderr=True, **kwargs):
+        out, err = self.run_embedded_interpreter(*args, **kwargs)
+        self.assertEqual(out.rstrip(), 'ok! Py_RunMain() returned 123')
+        if check_stderr:
+            self.assertEqual(err, '')
+
     def test_init_run_main_code_exitcode(self):
         code = CODE_EXITCODE_123
-        self.run_embedded_interpreter("test_init_run_main_code_exitcode",
-                                      code)
+        self.check_program_exitcode("test_init_run_main_code_exitcode", code)
 
     def test_init_run_main_script_exitcode(self):
         with tempfile.TemporaryDirectory() as tmpdir:
             filename = os.path.join(tmpdir, 'script.py')
             with open(filename, 'w') as fp:
                 fp.write(CODE_EXITCODE_123)
 
-            self.run_embedded_interpreter("test_init_run_main_script_exitcode",
-                                          filename)
+            self.check_program_exitcode("test_init_run_main_script_exitcode",
+                                        filename)
 
     def test_init_run_main_interactive_exitcode(self):
         code = CODE_EXITCODE_123
-        self.run_embedded_interpreter("test_init_run_main_interactive_exitcode",
-                                      input=code)
+        self.check_program_exitcode("test_init_run_main_interactive_exitcode",
+                                    input=code,
+                                    check_stderr=False)
 
     def test_init_run_main_module_exitcode(self):
         with tempfile.TemporaryDirectory() as tmpdir:
@@ -625,8 +631,8 @@ def test_init_run_main_module_exitcode(self):
 
             env = dict(os.environ)
             env['PYTHONPATH'] = tmpdir
-            self.run_embedded_interpreter("test_init_run_main_module_exitcode",
-                                          modname, env=env)
+            self.check_program_exitcode("test_init_run_main_module_exitcode",
+                                        modname, env=env)
 
 
 def config_dev_mode(preconfig, config):

Programs/_testembed.c

@@ -2037,6 +2037,9 @@ static int test_init_run_main_exitcode(Py_ssize_t argc, wchar_t * const *argv)
         return 1;
     }
 
+    // If Py_RunMain() calls Py_Exit(), this message is not written to stdout
+    printf("ok! Py_RunMain() returned 123\n");
+
     return 0;
 }