[python3/python3.3] fix test_posix (patch 158)

dmalcolm dmalcolm at fedoraproject.org
Mon Jul 23 18:06:50 UTC 2012


commit 3b4dd24c42a177bd8bda0ebf127f199ef32364ef
Author: David Malcolm <dmalcolm at redhat.com>
Date:   Mon Jul 23 14:05:53 2012 -0400

    fix test_posix (patch 158)

 00158-disable-test_fs_holes-in-rpm-build.patch |   11 +++++++++++
 python3.spec                                   |    9 +++++++++
 2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/00158-disable-test_fs_holes-in-rpm-build.patch b/00158-disable-test_fs_holes-in-rpm-build.patch
new file mode 100644
index 0000000..c0b0777
--- /dev/null
+++ b/00158-disable-test_fs_holes-in-rpm-build.patch
@@ -0,0 +1,11 @@
+diff -up Python-3.3.0b1/Lib/test/test_posix.py.disable-test_fs_holes-in-rpm-build.patch Python-3.3.0b1/Lib/test/test_posix.py
+--- Python-3.3.0b1/Lib/test/test_posix.py.disable-test_fs_holes-in-rpm-build.patch	2012-07-23 13:53:11.636847977 -0400
++++ Python-3.3.0b1/Lib/test/test_posix.py	2012-07-23 13:54:02.810208218 -0400
+@@ -1022,6 +1022,7 @@ class PosixTester(unittest.TestCase):
+         posix.RTLD_GLOBAL
+         posix.RTLD_LOCAL
+ 
++    @unittest._skipInRpmBuild('running kernel may not match kernel in chroot')
+     @unittest.skipUnless(hasattr(os, 'SEEK_HOLE'),
+                          "test needs an OS that reports file holes")
+     @unittest.skipIf(sys.platform in ('freebsd7', 'freebsd8', 'freebsd9'),
diff --git a/python3.spec b/python3.spec
index 5867aae..efba61f 100644
--- a/python3.spec
+++ b/python3.spec
@@ -458,6 +458,14 @@ Patch156: 00156-gdb-autoload-safepath.patch
 # (rhbz#697470)
 Patch157: 00157-uid-gid-overflows.patch
 
+# 00158 #
+# Python 3.3 added os.SEEK_DATA and os.SEEK_HOLE, which may be present in the
+# header files in the build chroot, but may not be supported in the running
+# kernel, hence we disable this test in an rpm build.
+# Adding these was upstream issue http://bugs.python.org/issue10142
+# Not yet sent upstream
+Patch158: 00158-disable-test_fs_holes-in-rpm-build.patch
+
 # (New patches go here ^^^)
 #
 # When adding new patches to "python" and "python3" in Fedora 17 onwards,
@@ -686,6 +694,7 @@ done
 %patch155 -p1
 %patch156 -p1
 %patch157 -p1
+%patch158 -p1
 
 # Currently (2010-01-15), http://docs.python.org/library is for 2.6, and there
 # are many differences between 2.6 and the Python 3 library.


More information about the scm-commits mailing list