diff --git a/python-2.7.2-disable-tests-in-test_io.patch b/python-2.7.2-disable-tests-in-test_io.patch deleted file mode 100644 index 7dde5f4..0000000 --- a/python-2.7.2-disable-tests-in-test_io.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Lib/test/test_io.py -+++ b/Lib/test/test_io.py -@@ -2970,6 +2970,7 @@ - self.check_interrupted_read_retry(lambda x: x, - mode="r") - -+ @unittest.skip('rhbz#732998') - @unittest.skipUnless(threading, 'Threading required for this test.') - def check_interrupted_write_retry(self, item, **fdopen_kwargs): - """Check that a buffered write, when it gets interrupted (either diff --git a/python-2.7.6-sqlite-3.8.4-tests.patch b/python-2.7.6-sqlite-3.8.4-tests.patch new file mode 100644 index 0000000..7044b31 --- /dev/null +++ b/python-2.7.6-sqlite-3.8.4-tests.patch @@ -0,0 +1,30 @@ +From: Benjamin Peterson +Date: Wed, 12 Mar 2014 21:51:52 -0500 +Subject: [PATCH] weaken callback count inequality (closes #20901) +Upstream: committed +References: https://bugzilla.novell.com/show_bug.cgi?id=867887 http://bugs.python.org/issue20901 http://hg.python.org/cpython/rev/1763e27a182d + +Fixes test failures with SQLite 3.8.4 + +[ 296s] test test_sqlite failed -- Traceback (most recent call last): +[ 296s] File "/home/abuild/rpmbuild/BUILD/Python-2.7.6/Lib/sqlite3/test/hooks.py", line 165, in CheckOpcodeCount +[ 296s] self.assertTrue(first_count > second_count) +[ 296s] AssertionError: False is not true + +--- + Lib/sqlite3/test/hooks.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: Python-2.7.6/Lib/sqlite3/test/hooks.py +=================================================================== +--- Python-2.7.6.orig/Lib/sqlite3/test/hooks.py 2014-03-14 20:32:55.000000000 +0000 ++++ Python-2.7.6/Lib/sqlite3/test/hooks.py 2014-03-14 20:34:07.000000000 +0000 +@@ -162,7 +162,7 @@ class ProgressTests(unittest.TestCase): + create table bar (a, b) + """) + second_count = len(progress_calls) +- self.assertTrue(first_count > second_count) ++ self.assertTrue(first_count >= second_count) + + def CheckCancelOperation(self): + """ diff --git a/python-base.changes b/python-base.changes index 2c66a83..1d02c55 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Mar 15 08:05:41 UTC 2014 - schwab@suse.de + +- Use profile-opt only when profiling is enabled +- python-2.7.2-disable-tests-in-test_io.patch: removed, no longer needed +- update testsuite exclusion list: + * test_signal and test_posix fail due to qemu bugs + +------------------------------------------------------------------- +Fri Mar 14 20:26:03 UTC 2014 - andreas.stieger@gmx.de + +- Fix build with SQLite 3.8.4 [bnc#867887], fixing SQLite tests, + adding python-2.7.6-sqlite-3.8.4-tests.patch + ------------------------------------------------------------------- Mon Feb 10 14:24:52 UTC 2014 - jmatejek@suse.com diff --git a/python-base.spec b/python-base.spec index f5b6a67..66f1a17 100644 --- a/python-base.spec +++ b/python-base.spec @@ -1,7 +1,7 @@ # # spec file for package python-base # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,7 +40,6 @@ Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch Patch10: sparc_longdouble.patch Patch13: python-2.7.2-fix_date_time_compiler.patch -Patch15: python-2.7.2-disable-tests-in-test_io.patch Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch @@ -62,6 +61,7 @@ Patch29: python-2.7.6-poplib.patch Patch30: python-2.7.6-bdist-rpm.patch # CVE-2014-1912 [bnc#863741] buffer overflow in recvfrom_into Patch31: CVE-2014-1912-recvfrom_into.patch +Patch32: python-2.7.6-sqlite-3.8.4-tests.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -145,10 +145,6 @@ other applications. %patch8 -p1 %patch10 -p1 %patch13 -p1 -#skip test_io test for ppc,ppc64 as it is broken. -%ifarch ppc ppc64 ppc64le -%patch15 -p1 -%endif %patch17 -p1 %patch18 -p1 %patch20 -p1 @@ -162,6 +158,7 @@ other applications. %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac @@ -186,8 +183,13 @@ touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h --enable-shared \ --enable-unicode=ucs4 +%if 0%{?do_profiling} +target=profile-opt +%else +target=all +%endif LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ - make %{?_smp_mflags} profile-opt + make %{?_smp_mflags} $target %check # on hppa, the threading of glibc is quite broken. The tests just stop @@ -196,34 +198,40 @@ LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ %ifnarch hppa # test_file(2k) fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin # test_urllib2 relies on being able to resolve local address, which is notoriously impossible in autobuild -EXCLUDE="-x test_urllib2 -x test_file -x test_file2k" +EXCLUDE="test_urllib2 test_file test_file2k" # test_nis and test_threading are AWFULLY slow. -EXCLUDE="$EXCLUDE -x test_nis -x test_threading" +EXCLUDE="$EXCLUDE test_nis test_threading" # test_gdb fails if gdb with (different) python support is part of the buildsystem -EXCLUDE="$EXCLUDE -x test_gdb" +EXCLUDE="$EXCLUDE test_gdb" %ifarch ia64 # test_smtplib's testSend is known to be broken and on ia64 it actually fails most of the time, preventing the build. -EXCLUDE="$EXCLUDE -x test_smtplib" +EXCLUDE="$EXCLUDE test_smtplib" %endif # test_unicode fails in Factory -EXCLUDE="$EXCLUDE -x test_unicode" +EXCLUDE="$EXCLUDE test_unicode" %if 0%{?qemu_user_space_build} # test_asyncore fails because of unimplemented sockopt -EXCLUDE="$EXCLUDE -x test_asyncore -x test_mmap" +EXCLUDE="$EXCLUDE test_asyncore test_mmap" # emulation is unreliable -EXCLUDE="$EXCLUDE -x test_multiprocessing" +EXCLUDE="$EXCLUDE test_multiprocessing" +# qemu bug (siginterrupt handling) +EXCLUDE="$EXCLUDE test_signal" +%endif +%ifarch aarch64 +# qemu bug (wrong USE_UID16) +EXCLUDE="$EXCLUDE test_posix" %endif # This test (part of test_uuid) requires real network interfaces # so that ifconfig output has "HWaddr ". Some kvm instances # don't have any such interface breaking the uuid module test. -EXCLUDE="$EXCLUDE -x test_uuid" +EXCLUDE="$EXCLUDE test_uuid" # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : fi -make test TESTOPTS="-l $EXCLUDE" TESTPYTHONOPTS="-R" +make test TESTOPTS="-l -x $EXCLUDE" TESTPYTHONOPTS="-R" # use network, be verbose: #make test TESTOPTS="-l -u network -v" %endif diff --git a/python-doc.changes b/python-doc.changes index e77edd6..e9ba256 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 14 20:26:03 UTC 2014 - andreas.stieger@gmx.de + +- Fix build with SQLite 3.8.4 [bnc#867887], fixing SQLite tests, + adding python-2.7.6-sqlite-3.8.4-tests.patch + ------------------------------------------------------------------- Thu Nov 21 15:55:04 UTC 2013 - jmatejek@suse.com diff --git a/python-doc.spec b/python-doc.spec index a6ca3ab..70a7deb 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -1,7 +1,7 @@ # # spec file for package python-doc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,7 +45,6 @@ Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch Patch10: sparc_longdouble.patch Patch13: python-2.7.2-fix_date_time_compiler.patch -Patch15: python-2.7.2-disable-tests-in-test_io.patch Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch @@ -67,6 +66,7 @@ Patch29: python-2.7.6-poplib.patch Patch30: python-2.7.6-bdist-rpm.patch # CVE-2014-1912 [bnc#863741] buffer overflow in recvfrom_into Patch31: CVE-2014-1912-recvfrom_into.patch +Patch32: python-2.7.6-sqlite-3.8.4-tests.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -104,10 +104,6 @@ Python, and Macintosh Module Reference in PDF format. %patch8 -p1 %patch10 -p1 %patch13 -p1 -#skip test_io test for ppc,ppc64 as it is broken. -%ifarch ppc ppc64 ppc64le -%patch15 -p1 -%endif %patch17 -p1 %patch18 -p1 %patch20 -p1 @@ -121,6 +117,7 @@ Python, and Macintosh Module Reference in PDF format. %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python.changes b/python.changes index d827564..ddb7264 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 14 20:26:03 UTC 2014 - andreas.stieger@gmx.de + +- Fix build with SQLite 3.8.4 [bnc#867887], fixing SQLite tests, + adding python-2.7.6-sqlite-3.8.4-tests.patch + ------------------------------------------------------------------- Thu Nov 21 15:54:55 UTC 2013 - jmatejek@suse.com diff --git a/python.spec b/python.spec index 0983671..39ddef6 100644 --- a/python.spec +++ b/python.spec @@ -1,7 +1,7 @@ # # spec file for package python # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -46,7 +46,6 @@ Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch Patch10: sparc_longdouble.patch Patch13: python-2.7.2-fix_date_time_compiler.patch -Patch15: python-2.7.2-disable-tests-in-test_io.patch Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch @@ -68,6 +67,7 @@ Patch29: python-2.7.6-poplib.patch Patch30: python-2.7.6-bdist-rpm.patch # CVE-2014-1912 [bnc#863741] buffer overflow in recvfrom_into Patch31: CVE-2014-1912-recvfrom_into.patch +Patch32: python-2.7.6-sqlite-3.8.4-tests.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -181,10 +181,6 @@ implementation of the standard Unix DBM databases. %patch8 -p1 %patch10 -p1 %patch13 -p1 -#skip test_io test for ppc,ppc64 as it is broken. -%ifarch ppc ppc64 ppc64le -%patch15 -p1 -%endif %patch17 -p1 %patch18 -p1 %patch20 -p1 @@ -198,6 +194,7 @@ implementation of the standard Unix DBM databases. %patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac