Test atexit shutdown mechanism in a subprocess (#4828)

pitrou · web-flow · commit fc5db95e0063 · 2017-12-13T02:29:07.000+01:00
* Test atexit shutdown mechanism in a subprocess
diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
@@ -3,6 +3,7 @@
 import io
 import atexit
 from test import support
+from test.support import script_helper
 
 ### helpers
 def h1():
@@ -152,6 +153,21 @@ def test_bound_methods(self):
         atexit._run_exitfuncs()
         self.assertEqual(l, [5])
 
+    def test_shutdown(self):
+        # Actually test the shutdown mechanism in a subprocess
+        code = """if 1:
+            import atexit
+
+            def f(msg):
+                print(msg)
+
+            atexit.register(f, "one")
+            atexit.register(f, "two")
+            """
+        res = script_helper.assert_python_ok("-c", code)
+        self.assertEqual(res.out.decode().splitlines(), ["two", "one"])
+        self.assertFalse(res.err)
+
 
 @support.cpython_only
 class SubinterpreterTest(unittest.TestCase):
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -2086,6 +2086,8 @@ _Py_FatalInitError(_PyInitError err)
 /* For the atexit module. */
 void _Py_PyAtExit(void (*func)(void))
 {
+    /* Guard against API misuse (see bpo-17852) */
+    assert(_PyRuntime.pyexitfunc == NULL || _PyRuntime.pyexitfunc == func);
     _PyRuntime.pyexitfunc = func;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2086,6 +2086,8 @@ _Py_FatalInitError(_PyInitError err)`
`2086`	`2086`	`/* For the atexit module. */`
`2087`	`2087`	`void _Py_PyAtExit(void (*func)(void))`
`2088`	`2088`	`{`
	`2089`	`+ /* Guard against API misuse (see bpo-17852) */`
	`2090`	`+ assert(_PyRuntime.pyexitfunc == NULL \|\| _PyRuntime.pyexitfunc == func);`
`2089`	`2091`	`_PyRuntime.pyexitfunc = func;`
`2090`	`2092`	`}`
`2091`	`2093`