- Add python-2.7.17-switch-off-failing-SSL-tests.patch to switch

off tests coliding with the combination of modern Python and
  ancient OpenSSL on SLE-12.

- Add python-2.7.17-switch-off-failing-SSL-tests.patch to switch
  off tests coliding with the combination of modern Python and
  ancient OpenSSL on SLE-12.

- libnsl is required only on more recent SLEs and openSUSE, older
  glibc supported NIS on its own.

- Add python-2.7.17-switch-off-failing-SSL-tests.patch to switch
  off tests coliding with the combination of modern Python and
  ancient OpenSSL on SLE-12.

- libnsl is required only on more recent SLEs and openSUSE, older
  glibc supported NIS on its own.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=272
This commit is contained in:
Matej Cepl 2020-01-28 14:39:17 +00:00 committed by Git OBS Bridge
parent 0601b7f8eb
commit 54c4187a2a
7 changed files with 73 additions and 1 deletions

View File

@ -0,0 +1,21 @@
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -152,9 +152,7 @@ def skip_if_broken_ubuntu_ssl(func):
try:
ssl.SSLContext(ssl.PROTOCOL_SSLv2)
except ssl.SSLError:
- if (ssl.OPENSSL_VERSION_INFO == (0, 9, 8, 15, 15) and
- platform.linux_distribution() == ('debian', 'squeeze/sid', '')):
- raise unittest.SkipTest("Patched Ubuntu OpenSSL breaks behaviour")
+ raise unittest.SkipTest("Test fails on SLE-12")
return func(*args, **kwargs)
return f
else:
@@ -1280,6 +1278,7 @@ class ContextTests(unittest.TestCase):
self.assertEqual(ctx.verify_mode, ssl.CERT_NONE)
self._assert_context_options(ctx)
+ @skip_if_broken_ubuntu_ssl
def test__https_verify_certificates(self):
# Unit test to check the contect factory mapping
# The factories themselves are tested above

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jan 27 16:47:56 CET 2020 - Matej Cepl <mcepl@suse.com>
- Add python-2.7.17-switch-off-failing-SSL-tests.patch to switch
off tests coliding with the combination of modern Python and
ancient OpenSSL on SLE-12.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 10 16:01:57 CET 2020 - Matej Cepl <mcepl@suse.com> Fri Jan 10 16:01:57 CET 2020 - Matej Cepl <mcepl@suse.com>

View File

@ -83,6 +83,8 @@ Patch55: bpo36302-sort-module-sources.patch
# to /usr/local if executable is /usr/bin/python* and RPM build # to /usr/local if executable is /usr/bin/python* and RPM build
# is not detected to make pip and distutils install into separate location # is not detected to make pip and distutils install into separate location
Patch56: adapted-from-F00251-change-user-install-location.patch Patch56: adapted-from-F00251-change-user-install-location.patch
# Switch couple of tests failing on acient SLE-12
Patch57: python-2.7.17-switch-off-failing-SSL-tests.patch
# COMMON-PATCH-END # COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3) %define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake BuildRequires: automake
@ -192,8 +194,12 @@ other applications.
%patch40 -p1 %patch40 -p1
%endif %endif
%patch41 -p1 %patch41 -p1
%if %{suse_version} >= 1500
%patch47 -p1 %patch47 -p1
%patch48 -p1 %patch48 -p1
%else
%patch57 -p1
%endif
%patch49 -p1 %patch49 -p1
%patch50 -p1 %patch50 -p1
%patch51 -p1 %patch51 -p1

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Jan 27 16:47:56 CET 2020 - Matej Cepl <mcepl@suse.com>
- Add python-2.7.17-switch-off-failing-SSL-tests.patch to switch
off tests coliding with the combination of modern Python and
ancient OpenSSL on SLE-12.
-------------------------------------------------------------------
Fri Jan 10 16:01:57 CET 2020 - Matej Cepl <mcepl@suse.com>
- libnsl is required only on more recent SLEs and openSUSE, older
glibc supported NIS on its own.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 2 10:34:17 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com> Thu Jan 2 10:34:17 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -83,6 +83,8 @@ Patch55: bpo36302-sort-module-sources.patch
# to /usr/local if executable is /usr/bin/python* and RPM build # to /usr/local if executable is /usr/bin/python* and RPM build
# is not detected to make pip and distutils install into separate location # is not detected to make pip and distutils install into separate location
Patch56: adapted-from-F00251-change-user-install-location.patch Patch56: adapted-from-F00251-change-user-install-location.patch
# Switch couple of tests failing on acient SLE-12
Patch57: python-2.7.17-switch-off-failing-SSL-tests.patch
# COMMON-PATCH-END # COMMON-PATCH-END
Provides: pyth_doc Provides: pyth_doc
Provides: pyth_ps Provides: pyth_ps
@ -136,8 +138,12 @@ Python, and Macintosh Module Reference in PDF format.
%patch40 -p1 %patch40 -p1
%endif %endif
%patch41 -p1 %patch41 -p1
%if %{suse_version} >= 1500
%patch47 -p1 %patch47 -p1
%patch48 -p1 %patch48 -p1
%else
%patch57 -p1
%endif
%patch49 -p1 %patch49 -p1
%patch50 -p1 %patch50 -p1
%patch51 -p1 %patch51 -p1

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Jan 27 16:47:56 CET 2020 - Matej Cepl <mcepl@suse.com>
- Add python-2.7.17-switch-off-failing-SSL-tests.patch to switch
off tests coliding with the combination of modern Python and
ancient OpenSSL on SLE-12.
-------------------------------------------------------------------
Fri Jan 10 16:01:57 CET 2020 - Matej Cepl <mcepl@suse.com>
- libnsl is required only on more recent SLEs and openSUSE, older
glibc supported NIS on its own.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 2 10:34:17 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com> Thu Jan 2 10:34:17 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>

View File

@ -87,6 +87,8 @@ Patch55: bpo36302-sort-module-sources.patch
# to /usr/local if executable is /usr/bin/python* and RPM build # to /usr/local if executable is /usr/bin/python* and RPM build
# is not detected to make pip and distutils install into separate location # is not detected to make pip and distutils install into separate location
Patch56: adapted-from-F00251-change-user-install-location.patch Patch56: adapted-from-F00251-change-user-install-location.patch
# Switch couple of tests failing on acient SLE-12
Patch57: python-2.7.17-switch-off-failing-SSL-tests.patch
# COMMON-PATCH-END # COMMON-PATCH-END
BuildRequires: automake BuildRequires: automake
BuildRequires: db-devel BuildRequires: db-devel
@ -254,8 +256,12 @@ that rely on earlier non-verification behavior.
%patch40 -p1 %patch40 -p1
%endif %endif
%patch41 -p1 %patch41 -p1
%if %{suse_version} >= 1500
%patch47 -p1 %patch47 -p1
%patch48 -p1 %patch48 -p1
%else
%patch57 -p1
%endif
%patch49 -p1 %patch49 -p1
%patch50 -p1 %patch50 -p1
%patch51 -p1 %patch51 -p1
@ -299,7 +305,7 @@ if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then
ulimit -v 10000000 || : ulimit -v 10000000 || :
fi fi
LIST="test_urllib test_ssl test_hashlib test_hmac test_unicodedata test_tarfile test_sqlite test_tcl test_dbm test_anydbm test_dumbdbm test_gdbm test_whichdb test_tk test_ttk_textonly test_bsddb test_bsddb3 test_readline" LIST="test_urllib test_ssl test_hashlib test_hmac test_unicodedata test_tarfile test_sqlite test_tcl test_dbm test_anydbm test_dumbdbm test_gdbm test_whichdb test_tk test_ttk_textonly test_bsddb test_bsddb3 test_readline"
make test TESTOPTS="$LIST" TESTPYTHONOPTS="-R" make test TESTOPTS="-w $LIST" TESTPYTHONOPTS="-R"
%endif %endif
%install %install