Issue #20667: KqueueEventLoopTests.test_read_pty_output() hangs also on OpenBSD 5.5.

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 05e58b26c6048e999d5e0a98d26c23130f6aefe8..9857f9dca4ba8eac42ee3bed322de8f80e917334 100644 (file)
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -78,7 +78,6 @@ __all__ = [
     "create_empty_file", "can_symlink", "fs_is_case_insensitive",
     # unittest
     "is_resource_enabled", "requires", "requires_freebsd_version",
-    "requires_openbsd_version",
     "requires_linux_version", "requires_mac_ver", "check_syntax_error",
     "TransientResource", "time_out", "socket_peer_reset", "ioerror_peer_reset",
     "transient_internet", "BasicTestRunner", "run_unittest", "run_doctest",
@@ -468,15 +467,6 @@ def requires_freebsd_version(*min_version):
     """
     return _requires_unix_version('FreeBSD', min_version)
 
-def requires_openbsd_version(*min_version):
-    """Decorator raising SkipTest if the OS is OpenBSD and the OpenBSD version
-    is less than `min_version`.
-
-    For example, @requires_freebsd_version(5, 4) raises SkipTest if the FreeBSD
-    version is less than 5.4.
-    """
-    return _requires_unix_version('OpenBSD', min_version)
-
 def requires_linux_version(*min_version):
     """Decorator raising SkipTest if the OS is Linux and the Linux version is
     less than `min_version`.

diff --git a/Lib/test/test_asyncio/test_events.py b/Lib/test/test_asyncio/test_events.py
index c2c0515e4a1d04ba9646bb5362f66b969f049545..8c32a6e7c2be90b52c3abb899a0d272fad4aeda7 100644 (file)
--- a/Lib/test/test_asyncio/test_events.py
+++ b/Lib/test/test_asyncio/test_events.py
@@ -1623,8 +1623,9 @@ else:
             # than 10.9 (Maverick)
             @support.requires_mac_ver(10, 9)
             # Issue #20667: KqueueEventLoopTests.test_read_pty_output()
-            # hangs on OpenBSD 5.4
-            @support.requires_openbsd_version(5, 5)
+            # hangs on OpenBSD 5.5
+            @unittest.skipIf(sys.platform.startswith('openbsd'),
+                             'test hangs on OpenBSD')
             def test_read_pty_output(self):
                 super().test_read_pty_output()