From bf08f601fa67f005d5f21095b8fd455f7c7e7fab Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 22 Sep 2025 11:41:36 +1000
Subject: [PATCH] tests/cmdline: Add tests for using -m combined with
 sys.atexit.

Signed-off-by: Damien George <damien@micropython.org>
---
 tests/cmdline/cmd_module_atexit.py         | 16 ++++++++++++++++
 tests/cmdline/cmd_module_atexit.py.exp     |  3 +++
 tests/cmdline/cmd_module_atexit_exc.py     | 19 +++++++++++++++++++
 tests/cmdline/cmd_module_atexit_exc.py.exp |  3 +++
 4 files changed, 41 insertions(+)
 create mode 100644 tests/cmdline/cmd_module_atexit.py
 create mode 100644 tests/cmdline/cmd_module_atexit.py.exp
 create mode 100644 tests/cmdline/cmd_module_atexit_exc.py
 create mode 100644 tests/cmdline/cmd_module_atexit_exc.py.exp

diff --git a/tests/cmdline/cmd_module_atexit.py b/tests/cmdline/cmd_module_atexit.py
new file mode 100644
index 0000000000..100bc11277
--- /dev/null
+++ b/tests/cmdline/cmd_module_atexit.py
@@ -0,0 +1,16 @@
+# cmdline: -m cmdline.cmd_module_atexit
+#
+# Test running as a module and using sys.atexit.
+
+import sys
+
+if not hasattr(sys, "atexit"):
+    print("SKIP")
+    raise SystemExit
+
+# Verify we ran as a module.
+print(sys.argv)
+
+sys.atexit(lambda: print("done"))
+
+print("start")
diff --git a/tests/cmdline/cmd_module_atexit.py.exp b/tests/cmdline/cmd_module_atexit.py.exp
new file mode 100644
index 0000000000..2a0f756b1e
--- /dev/null
+++ b/tests/cmdline/cmd_module_atexit.py.exp
@@ -0,0 +1,3 @@
+['cmdline.cmd_module_atexit', 'cmdline/cmd_module_atexit.py']
+start
+done
diff --git a/tests/cmdline/cmd_module_atexit_exc.py b/tests/cmdline/cmd_module_atexit_exc.py
new file mode 100644
index 0000000000..88940a7741
--- /dev/null
+++ b/tests/cmdline/cmd_module_atexit_exc.py
@@ -0,0 +1,19 @@
+# cmdline: -m cmdline.cmd_module_atexit_exc
+#
+# Test running as a module and using sys.atexit, with script completion via sys.exit.
+
+import sys
+
+if not hasattr(sys, "atexit"):
+    print("SKIP")
+    raise SystemExit
+
+# Verify we ran as a module.
+print(sys.argv)
+
+sys.atexit(lambda: print("done"))
+
+print("start")
+
+# This will raise SystemExit to finish the script, and atexit should still be run.
+sys.exit(0)
diff --git a/tests/cmdline/cmd_module_atexit_exc.py.exp b/tests/cmdline/cmd_module_atexit_exc.py.exp
new file mode 100644
index 0000000000..6320d9d2d3
--- /dev/null
+++ b/tests/cmdline/cmd_module_atexit_exc.py.exp
@@ -0,0 +1,3 @@
+['cmdline.cmd_module_atexit_exc', 'cmdline/cmd_module_atexit_exc.py']
+start
+done