Update changelog, add run_pytest script, and improve IRIS stop handling in Docker script

Author: grongierisc

CHANGELOG.md

@@ -14,6 +14,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update the default `PersistentMessage` schema mode from `extend` to `managed`
   for compatibility with `iris-persistence` 0.3.
 
+### Fixed
+- Make CLI mocks resolve consistently on Python 3.10 when `iop.cli.main` is
+  also exposed as the public CLI function.
+- Preserve pytest's real exit status when preview IRIS changes the process
+  status during Embedded Python interpreter shutdown.
+
 ### Internal
 - Add wheel-content and installed-ObjectScript validation.
 - Refactor persistent-message resolution and production/migration internals

scripts/run_pytest.py

@@ -0,0 +1,26 @@
+"""Run pytest while preserving its exit code under IRIS Embedded Python.
+
+Some preview IRIS builds can change the process status during interpreter
+shutdown after pytest has already completed successfully. All pytest fixture
+and plugin teardown has finished by the time ``pytest.main`` returns, so exit
+directly with that result instead of allowing a later runtime hook to replace
+it.
+"""
+
+from __future__ import annotations
+
+import os
+import sys
+
+import pytest
+
+
+def main() -> None:
+    exit_code = pytest.main(sys.argv[1:])
+    sys.stdout.flush()
+    sys.stderr.flush()
+    os._exit(int(exit_code))
+
+
+if __name__ == "__main__":
+    main()

src/tests/unit/test_cli.py

@@ -3,28 +3,31 @@
 import runpy
 import tempfile
 import unittest
+from importlib import import_module
 from io import StringIO
 from unittest.mock import MagicMock, patch
 
 from iop.cli.main import _format_test_response, main
 
+cli_main_module = import_module("iop.cli.main")
+
 
 class TestIOPCli(unittest.TestCase):
     """Test cases for IOP CLI functionality."""
 
     def setUp(self):
         # Force local mode regardless of any IOP_URL / IOP_SETTINGS env vars
         # that may be set by a parallel e2e test session.
-        self._remote_patcher = patch(
-            "iop.cli.main.get_remote_settings", return_value=None
+        self._remote_patcher = patch.object(
+            cli_main_module, "get_remote_settings", return_value=None
         )
         self._remote_patcher.start()
 
     def tearDown(self):
         self._remote_patcher.stop()
 
     def test_module_entrypoint_calls_cli_main(self):
-        with patch("iop.cli.main.main") as mock_main:
+        with patch.object(cli_main_module, "main") as mock_main:
             runpy.run_module("iop", run_name="__main__")
 
         mock_main.assert_called_once_with()
@@ -275,8 +278,9 @@ def test_export_defaults_to_json(self):
     def test_export_python_format_uses_production_reconstruction(self):
         production = MagicMock()
         production.to_python.return_value = "from iop import Production\n"
-        with patch(
-            "iop.cli.main.Production.from_iris",
+        with patch.object(
+            cli_main_module.Production,
+            "from_iris",
             return_value=production,
         ) as mock_from_iris:
             with patch("sys.stdout", new=StringIO()) as fake_out:
@@ -294,8 +298,9 @@ def test_export_python_format_uses_production_reconstruction(self):
     def test_export_class_format_uses_production_reconstruction(self):
         production = MagicMock()
         production.to_class.return_value = "from iop import Production, ServiceItem\n"
-        with patch(
-            "iop.cli.main.Production.from_iris",
+        with patch.object(
+            cli_main_module.Production,
+            "from_iris",
             return_value=production,
         ) as mock_from_iris:
             with patch("sys.stdout", new=StringIO()) as fake_out:
@@ -316,8 +321,9 @@ def test_export_class_format_uses_production_reconstruction(self):
     def test_export_graph_format_prints_reconstructed_graph(self):
         production = MagicMock()
         production.graph.return_value = "Demo.Production\n  FileInput"
-        with patch(
-            "iop.cli.main.Production.from_iris",
+        with patch.object(
+            cli_main_module.Production,
+            "from_iris",
             return_value=production,
         ):
             with patch("sys.stdout", new=StringIO()) as fake_out:
@@ -331,8 +337,9 @@ def test_export_graph_format_prints_reconstructed_graph(self):
     def test_export_mermaid_format_prints_reconstructed_graph(self):
         production = MagicMock()
         production.to_mermaid.return_value = "flowchart LR\n  FileInput --> Order\n"
-        with patch(
-            "iop.cli.main.Production.from_iris",
+        with patch.object(
+            cli_main_module.Production,
+            "from_iris",
             return_value=production,
         ) as mock_from_iris:
             with patch("sys.stdout", new=StringIO()) as fake_out:

test-in-docker.sh

@@ -9,7 +9,10 @@ iris_start () {
 
 iris_stop () {
   echo "Stopping IRIS"
-  iris stop iris quietly
+  if ! iris stop iris quietly; then
+    echo "Warning: IRIS did not stop cleanly; container cleanup will terminate it." >&2
+  fi
+  return 0
 }
 
 exit_on_error () {
@@ -37,7 +40,7 @@ exit_on_error
 
 # Unit and local IRIS tests. Remote API tests run in their dedicated CI job.
 cd ..
-python3 -m pytest src/tests/unit src/tests/e2e/local
+python3 scripts/run_pytest.py src/tests/unit src/tests/e2e/local
 exit_on_error
 
 # Integration tests