WIP

Author: moreati

.github/workflows/tests.yml

@@ -25,12 +25,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tox_env: py27-m_ans-ans2.10
-          - tox_env: py27-m_ans-ans4
-
-          - tox_env: py36-m_ans-ans2.10
-          - tox_env: py36-m_ans-ans4
-
           - tox_env: py27-m_mtg
           - tox_env: py36-m_mtg
 
@@ -86,34 +80,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tox_env: py311-m_ans-ans2.10
-            python_version: '3.11'
-          - tox_env: py311-m_ans-ans3
-            python_version: '3.11'
-          - tox_env: py311-m_ans-ans4
-            python_version: '3.11'
-          - tox_env: py311-m_ans-ans5
-            python_version: '3.11'
-          - tox_env: py313-m_ans-ans6
-            python_version: '3.13'
-          - tox_env: py313-m_ans-ans7
-            python_version: '3.13'
-          - tox_env: py313-m_ans-ans8
-            python_version: '3.13'
-          - tox_env: py314-m_ans-ans9
-            python_version: '3.14'
-          - tox_env: py314-m_ans-ans10
-            python_version: '3.14'
-          - tox_env: py314-m_ans-ans11
-            python_version: '3.14'
-          - tox_env: py314-m_ans-ans12
-            python_version: '3.14'
-          - tox_env: py314-m_ans-ans13
-            python_version: '3.14'
-
-          - tox_env: py314-m_ans-ans13-s_lin
-            python_version: '3.14'
-
           - tox_env: py314-m_mtg
             python_version: '3.14'
 
@@ -161,11 +127,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - tox_env: py314-m_lcl-ans13
-            python_version: '3.14'
-          - tox_env: py314-m_lcl-ans13-s_lin
-            python_version: '3.14'
-
           - tox_env: py314-m_mtg
             python_version: '3.14'
 

mitogen/parent.py

@@ -1439,8 +1439,13 @@ def _first_stage():
         # Read `len(compressed preamble)` bytes sent by our Mitogen parent.
         # `select()` handles non-blocking stdin (e.g. sudo + log_output).
         # `C` accumulates compressed bytes.
+        # `c` supports detecting EOF (`<stdin>.read(...) -> b''`).
         C=''.encode()
-        while int(sys.argv[3])-len(C)and select.select([0],[],[]):C+=os.read(0,int(sys.argv[3])-len(C))
+        c=1
+        while c and int(sys.argv[3])-len(C)and select.select([0],[],[]):
+            c=os.read(0,int(sys.argv[3])-len(C))
+            # Raises `TypeError` if non-blocking read returns `None`
+            C+=c
         # Raises `zlib.error` if compressed preamble is truncated or invalid
         C=zlib.decompress(C)
         f=os.fdopen(W,'wb',0)

tests/first_stage_test.py

@@ -50,3 +50,30 @@ def test_valid_syntax(self):
             )
         finally:
             fp.close()
+
+    def test_stage(self):
+        options = mitogen.parent.Options(max_message_size=123)
+        conn = mitogen.parent.Connection(options, self.router)
+        conn.context = mitogen.core.Context(None, 123)
+
+        proc = testlib.subprocess.Popen(
+            args=conn.get_boot_command(),
+            stdout=testlib.subprocess.PIPE,
+            stderr=testlib.subprocess.PIPE,
+            stdin=testlib.subprocess.PIPE,
+        )
+        stdout, stderr = proc.communicate(conn.get_preamble(), timeout=10)
+
+        # proc is killed by SIGTERM as the broker kills itself
+        self.assertEqual(-15, proc.returncode)
+        expected_stdout_prefix = b("%s\n%s\n%s\n") % (
+            mitogen.parent.BootstrapProtocol.EC0_MARKER,
+            mitogen.parent.BootstrapProtocol.EC1_MARKER,
+            mitogen.parent.BootstrapProtocol.EC2_MARKER,
+        )
+        self.assertTrue(
+            stdout.startswith(expected_stdout_prefix),
+            "%r not at start of %r" % (expected_stdout_prefix, stdout),
+        )
+        self.assertIn(b'shutting down', stdout)
+        self.assertEqual(b(""), stderr)