summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoko@ubuntu.com <doko@ubuntu.com>2013-08-03 16:18:55 +0200
committerdoko@ubuntu.com <doko@ubuntu.com>2013-08-03 16:18:55 +0200
commitfb0ffa12fc79dfa4f97a61d9c32995551f995c1d (patch)
tree0196464fa32012b4828dedf4cf3d0c360d7dc10b
parent13371303351de5812c07d55dc29cacdef5cf1287 (diff)
parent1dfb9180a736c9033730ce05db696ee32c5a3d1c (diff)
downloadcpython-git-fb0ffa12fc79dfa4f97a61d9c32995551f995c1d.tar.gz
- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).
-rw-r--r--Lib/test/test_fcntl.py2
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py
index 9dd887ab1a..b64eba2cad 100644
--- a/Lib/test/test_fcntl.py
+++ b/Lib/test/test_fcntl.py
@@ -32,6 +32,8 @@ def get_lockdata():
pid_t = 'l'
lockdata = struct.pack(off_t + off_t + pid_t + 'hh', 0, 0, 0,
fcntl.F_WRLCK, 0)
+ elif sys.platform.startswith('gnukfreebsd'):
+ lockdata = struct.pack('qqihhi', 0, 0, 0, fcntl.F_WRLCK, 0, 0)
elif sys.platform in ['aix3', 'aix4', 'hp-uxB', 'unixware7']:
lockdata = struct.pack('hhlllii', fcntl.F_WRLCK, 0, 0, 0, 0, 0, 0)
else:
diff --git a/Misc/NEWS b/Misc/NEWS
index f066212c50..edf95f5948 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -599,6 +599,8 @@ Library
Tests
-----
+- Fix a fcntl test case on KFreeBSD, Debian #708653 (Petr Salinger).
+
- Issue #18396: Fix spurious test failure in test_signal on Windows when
faulthandler is enabled (Patch by Jeremy Kloth)