summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-02-18 08:13:47 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-02-18 08:13:47 (GMT)
commit9141bff1446e6b73b2fb71a30c9c3446d7b90917 (patch)
treed2119561b69da32b0dba1ad42a58f870298c5398
parent79bf89986c6610b30b8c1dc3e4cc5195dc43c8eb (diff)
downloadcpython-9141bff1446e6b73b2fb71a30c9c3446d7b90917.zip
cpython-9141bff1446e6b73b2fb71a30c9c3446d7b90917.tar.gz
cpython-9141bff1446e6b73b2fb71a30c9c3446d7b90917.tar.bz2
Issue #20667: KqueueEventLoopTests.test_read_pty_output() hangs also on OpenBSD 5.5.
-rw-r--r--Lib/test/support/__init__.py10
-rw-r--r--Lib/test/test_asyncio/test_events.py5
2 files changed, 3 insertions, 12 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 05e58b2..9857f9d 100644
--- 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 c2c0515..8c32a6e 100644
--- 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()