Treat ENXIO as success

Author: ambv

Lib/test/test_pyrepl/eio_test_script.py

@@ -21,7 +21,7 @@ def create_eio_condition():
             try:
                 os.setsid()
                 fcntl.ioctl(slave_fd, termios.TIOCSCTTY, 0)
-                p2_pgid = os.getpgrp()
+                child_process_group_id = os.getpgrp()
                 grandchild_pid = os.fork()
                 if grandchild_pid == 0:
                     os.setpgid(0, 0)      # set process group for grandchild
@@ -33,7 +33,7 @@ def create_eio_condition():
                         sys.exit(0)  # exit the child process that was just obtained
                     else:
                         try:
-                            os.tcsetpgrp(0, p2_pgid)
+                            os.tcsetpgrp(0, child_process_group_id)
                         except OSError:
                             pass
                         sys.exit(0)
@@ -48,7 +48,7 @@ def create_eio_condition():
                         os.close(slave_fd)
                     os.waitpid(grandchild_pid, 0)
                     # Manipulate terminal control to create EIO condition
-                    os.tcsetpgrp(master_fd, p2_pgid)
+                    os.tcsetpgrp(master_fd, child_process_group_id)
                     # Now try to read from master - this might cause EIO
                     try:
                         os.read(master_fd, 1)

Lib/test/test_pyrepl/test_unix_console.py

@@ -318,6 +318,7 @@ def test_restore_with_invalid_environ_on_macos(self, _os_write):
             console.restore()  # this should succeed
 
 
+@unittest.skipIf(sys.platform == "win32", "No Unix console on Windows")
 class TestUnixConsoleEIOHandling(TestCase):
 
     @patch('_pyrepl.unix_console.tcsetattr')
@@ -359,5 +360,15 @@ def test_repl_eio(self):
 
         os.kill(proc.pid, signal.SIGUSR1)
         _, err = proc.communicate(timeout=5)  # sleep for pty to settle
-        self.assertEqual(proc.returncode, 1, f"Expected EIO error, got return code {proc.returncode}")
-        self.assertIn("Got EIO:", err, f"Expected EIO error message in stderr: {err}")
+        self.assertEqual(
+            proc.returncode,
+            1,
+            f"Expected EIO/ENXIO error, got return code {proc.returncode}",
+        )
+        self.assertTrue(
+            (
+                "Got EIO:" in err
+                or "Got ENXIO:" in err
+            ),
+            f"Expected EIO/ENXIO error message in stderr: {err}",
+        )