gh-149879: Fix test_termios and test_ioctl on Cygwin (#150412)

Skip tests failing on Cygwin.

diff --git a/Lib/test/test_ioctl.py b/Lib/test/test_ioctl.py
index 277d2fc99eaec65f93d11d396d9db9b98aa8f791..0bcabd579a1b309884b9de15e3ea7f3d724891d1 100644 (file)
--- a/Lib/test/test_ioctl.py
+++ b/Lib/test/test_ioctl.py
@@ -139,6 +139,7 @@ class IoctlTestsPty(unittest.TestCase):
         self.addCleanup(os.close, self.master_fd)
 
     @unittest.skipUnless(hasattr(termios, 'TCFLSH'), 'requires termios.TCFLSH')
+    @unittest.skipIf(sys.platform == 'cygwin', 'test failed on Cygwin')
     def test_ioctl_clear_input_or_output(self):
         wfd = self.slave_fd
         rfd = self.master_fd

diff --git a/Lib/test/test_termios.py b/Lib/test/test_termios.py
index ce8392a6ccdbd66fd9f23f421092095585c6b081..3dcf5bd13791dc1b1c614876f2d604aa979a1e38 100644 (file)
--- a/Lib/test/test_termios.py
+++ b/Lib/test/test_termios.py
@@ -1,3 +1,4 @@
+import contextlib
 import errno
 import os
 import sys
@@ -11,6 +12,19 @@ from test.support.import_helper import import_module
 termios = import_module('termios')
 
 
+# Skip the test on ENOTTY error
+@contextlib.contextmanager
+def skip_enotty_error(testcase, func, platforms):
+    try:
+        yield
+    except termios.error as exc:
+        if (exc.args[0] == errno.ENOTTY
+            and sys.platform.startswith(platforms)):
+            testcase.skipTest(f'termios.{func}() is not supported '
+                              f'with pseudo-terminals (?) on {sys.platform}')
+        raise
+
+
 @unittest.skipUnless(hasattr(os, 'openpty'), "need os.openpty()")
 class TestFunctions(unittest.TestCase):
 
@@ -90,7 +104,8 @@ class TestFunctions(unittest.TestCase):
             self.assertRaises(TypeError, termios.tcsetattr, self.fd, termios.TCSANOW, attrs2)
         self.assertRaises(TypeError, termios.tcsetattr, self.fd, termios.TCSANOW, object())
         self.assertRaises(TypeError, termios.tcsetattr, self.fd, termios.TCSANOW)
-        self.assertRaisesTermiosError(errno.EINVAL, termios.tcsetattr, self.fd, -1, attrs)
+        if sys.platform != 'cygwin':
+            self.assertRaisesTermiosError(errno.EINVAL, termios.tcsetattr, self.fd, -1, attrs)
         self.assertRaises(OverflowError, termios.tcsetattr, self.fd, 2**1000, attrs)
         self.assertRaises(TypeError, termios.tcsetattr, self.fd, object(), attrs)
         self.assertRaisesTermiosError(errno.ENOTTY, termios.tcsetattr, self.bad_fd, termios.TCSANOW, attrs)
@@ -101,14 +116,10 @@ class TestFunctions(unittest.TestCase):
 
     @support.skip_android_selinux('tcsendbreak')
     def test_tcsendbreak(self):
-        try:
+        with skip_enotty_error(self, 'tcsendbreak',
+                               ('freebsd', 'netbsd', 'cygwin')):
             termios.tcsendbreak(self.fd, 1)
-        except termios.error as exc:
-            if exc.args[0] == errno.ENOTTY and sys.platform.startswith(('freebsd', "netbsd")):
-                self.skipTest('termios.tcsendbreak() is not supported '
-                              'with pseudo-terminals (?) on this platform')
-            raise
-        termios.tcsendbreak(self.stream, 1)
+            termios.tcsendbreak(self.stream, 1)
 
     @support.skip_android_selinux('tcsendbreak')
     def test_tcsendbreak_errors(self):
@@ -123,8 +134,9 @@ class TestFunctions(unittest.TestCase):
 
     @support.skip_android_selinux('tcdrain')
     def test_tcdrain(self):
-        termios.tcdrain(self.fd)
-        termios.tcdrain(self.stream)
+        with skip_enotty_error(self, 'tcdrain', ('cygwin',)):
+            termios.tcdrain(self.fd)
+            termios.tcdrain(self.stream)
 
     @support.skip_android_selinux('tcdrain')
     def test_tcdrain_errors(self):
@@ -149,6 +161,7 @@ class TestFunctions(unittest.TestCase):
         self.assertRaises(TypeError, termios.tcflush, object(), termios.TCIFLUSH)
         self.assertRaises(TypeError, termios.tcflush, self.fd)
 
+    @unittest.skipIf(sys.platform == 'cygwin', 'test fails on Cygwin')
     def test_tcflush_clear_input_or_output(self):
         wfd = self.fd
         rfd = self.master_fd
@@ -176,14 +189,16 @@ class TestFunctions(unittest.TestCase):
 
     @support.skip_android_selinux('tcflow')
     def test_tcflow(self):
-        termios.tcflow(self.fd, termios.TCOOFF)
-        termios.tcflow(self.fd, termios.TCOON)
-        termios.tcflow(self.fd, termios.TCIOFF)
-        termios.tcflow(self.fd, termios.TCION)
+        with skip_enotty_error(self, 'tcflow', ('cygwin',)):
+            termios.tcflow(self.fd, termios.TCOOFF)
+            termios.tcflow(self.fd, termios.TCOON)
+            termios.tcflow(self.fd, termios.TCIOFF)
+            termios.tcflow(self.fd, termios.TCION)
 
     @support.skip_android_selinux('tcflow')
     def test_tcflow_errors(self):
-        self.assertRaisesTermiosError(errno.EINVAL, termios.tcflow, self.fd, -1)
+        if sys.platform != 'cygwin':
+            self.assertRaisesTermiosError(errno.EINVAL, termios.tcflow, self.fd, -1)
         self.assertRaises(OverflowError, termios.tcflow, self.fd, 2**1000)
         self.assertRaises(TypeError, termios.tcflow, self.fd, object())
         self.assertRaisesTermiosError(errno.ENOTTY, termios.tcflow, self.bad_fd, termios.TCOON)