Skip to content

Test atexit shutdown mechanism in a subprocess #4828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pitrou merged 3 commits into from
Dec 13, 2017
Merged

Test atexit shutdown mechanism in a subprocess #4828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d304da0
Test atexit shutdown mechanism in a subprocess
pitrou Dec 13, 2017
e9403f7
Merge branch 'master' of https://github.com/python/cpython into atexi…
pitrou Dec 13, 2017
a90768c
Add reference to bpo entry
pitrou Dec 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Test atexit shutdown mechanism in a subprocess
  • Loading branch information
@pitrou
pitrou committed Dec 13, 2017
commit d304da069bd19e02522a5c458749801a18f28bad
16 changes: 16 additions & 0 deletions Lib/test/test_atexit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io
import atexit
from test import support
from test.support import script_helper

### helpers
def h1():
Expand Down Expand Up @@ -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):
Expand Down
2 changes: 2 additions & 0 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2086,6 +2086,8 @@ _Py_FatalInitError(_PyInitError err)
/* For the atexit module. */
void _Py_PyAtExit(void (*func)(void))
{
/* Guard against API misuse */

@vstinner vstinner Dec 13, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add "bpo-17852: " prefix. Otherwise, the purpose of the assertion is not obvious.

Or explain that calling this function to register a new callback replaces the previous callback, which is unlikely to be the expected behaviour.

@pitrou pitrou Dec 13, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, adding a bpo references sounds good to me.

assert(_PyRuntime.pyexitfunc == NULL || _PyRuntime.pyexitfunc == func);
_PyRuntime.pyexitfunc = func;
}

Expand Down