summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2011-08-23 17:46:46 (GMT)
committerCharles-François Natali <neologix@free.fr>2011-08-23 17:46:46 (GMT)
commit6cea35a8e3e1a8afe2ad763af41c8afc040efed0 (patch)
tree457432a77bdd4c840b85dfb6c38f6f13ed96ef99
parenta5c92b471405bfd4f639b99c6584166a4e6dd53f (diff)
downloadcpython-6cea35a8e3e1a8afe2ad763af41c8afc040efed0.zip
cpython-6cea35a8e3e1a8afe2ad763af41c8afc040efed0.tar.gz
cpython-6cea35a8e3e1a8afe2ad763af41c8afc040efed0.tar.bz2
Issue #12821: Fix test_fcntl failures on OpenBSD 5.
-rw-r--r--Lib/test/test_fcntl.py8
-rw-r--r--Misc/NEWS6
2 files changed, 8 insertions, 6 deletions
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index 6c64b82..29af99c 100644
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -23,12 +23,8 @@ def get_lockdata():
else:
start_len = "qq"
- if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
- 'Darwin1.2', 'darwin',
- 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
- 'freebsd6', 'freebsd7', 'freebsd8',
- 'bsdos2', 'bsdos3', 'bsdos4',
- 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
+ if (sys.platform.startswith(('netbsd', 'freebsd', 'openbsd', 'bsdos'))
+ or sys.platform == 'darwin'):
if struct.calcsize('l') == 8:
off_t = 'l'
pid_t = 'i'
diff --git a/Misc/NEWS b/Misc/NEWS
index 6673d20..09955b7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,12 @@ Library
- Issue #12650: Fix a race condition where a subprocess.Popen could leak
resources (FD/zombie) when killed at the wrong time.
+Tests
+-----
+
+- Issue #12821: Fix test_fcntl failures on OpenBSD 5.
+
+
What's New in Python 3.2.2?
===========================