From 7b1c9bbcace09fdb3789635e6d565285831e5f6338ea360750c8f1c9d8d76632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= Date: Tue, 13 Jan 2026 09:41:54 +0000 Subject: [PATCH 1/3] Skip flaky test_dummy_verify test in s390x --- saltbundlepy-passlib.changes | 5 +++++ saltbundlepy-passlib.spec | 1 + skip_flaky_test_on_s390x.patch | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) create mode 100644 skip_flaky_test_on_s390x.patch diff --git a/saltbundlepy-passlib.changes b/saltbundlepy-passlib.changes index 3108737..1b47f13 100644 --- a/saltbundlepy-passlib.changes +++ b/saltbundlepy-passlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 13 09:40:38 UTC 2026 - Pablo Suárez Hernández + +- Skip flaky "test_dummy_verify" test on s390x + ------------------------------------------------------------------- Wed Jul 16 14:58:00 UTC 2025 - Victor Zhestkov diff --git a/saltbundlepy-passlib.spec b/saltbundlepy-passlib.spec index be2ba46..cac7a02 100644 --- a/saltbundlepy-passlib.spec +++ b/saltbundlepy-passlib.spec @@ -37,6 +37,7 @@ URL: https://foss.heptapod.net/python-libs/passlib Source: https://files.pythonhosted.org/packages/source/p/passlib/passlib-%{version}.tar.gz # PATCH-FIX-OPENSUSE Posted to https://foss.heptapod.net/python-libs/passlib/-/issues/185 Patch0: no-pkg_resources.patch +Patch1: skip_flaky_test_on_s390x.patch BuildRequires: %{saltbundlepy_module pip} BuildRequires: %{saltbundlepy_module setuptools} BuildRequires: %{saltbundlepy_module wheel} diff --git a/skip_flaky_test_on_s390x.patch b/skip_flaky_test_on_s390x.patch new file mode 100644 index 0000000..c9541de --- /dev/null +++ b/skip_flaky_test_on_s390x.patch @@ -0,0 +1,32 @@ +Index: saltbundlepy-passlib-1.7.4-build/passlib-1.7.4/passlib/tests/test_context.py +=================================================================== +--- saltbundlepy-passlib-1.7.4-build.orig/passlib-1.7.4/passlib/tests/test_context.py ++++ saltbundlepy-passlib-1.7.4-build/passlib-1.7.4/passlib/tests/test_context.py +@@ -13,6 +13,7 @@ import datetime + from functools import partial + import logging; log = logging.getLogger(__name__) + import os ++import unittest + import warnings + # site + # pkg +@@ -35,6 +36,11 @@ from passlib.registry import (register_c + #============================================================================= + here = os.path.abspath(os.path.dirname(__file__)) + ++skip_on_s390x = unittest.skipIf( ++ hasattr(os, 'uname') and os.uname().machine == 's390x', ++ 'skipped on s390x' ++) ++ + def merge_dicts(first, *args, **kwds): + target = first.copy() + for arg in args: +@@ -1590,6 +1596,7 @@ sha512_crypt__min_rounds = 45000 + self.assertEqual(ctx.using(harden_verify="true").harden_verify, None) + self.assertEqual(ctx.using(harden_verify="false").harden_verify, None) + ++ @skip_on_s390x + def test_dummy_verify(self): + """ + dummy_verify() method -- 2.51.1 From 23fea77af394e19a4c86af5394eb5217e857de7c2aca1921753c0dea60f16e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= Date: Tue, 13 Jan 2026 09:51:50 +0000 Subject: [PATCH 2/3] Fix patch file to allow applying it properly --- skip_flaky_test_on_s390x.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/skip_flaky_test_on_s390x.patch b/skip_flaky_test_on_s390x.patch index c9541de..418d850 100644 --- a/skip_flaky_test_on_s390x.patch +++ b/skip_flaky_test_on_s390x.patch @@ -1,7 +1,7 @@ -Index: saltbundlepy-passlib-1.7.4-build/passlib-1.7.4/passlib/tests/test_context.py +Index: passlib-1.7.4/passlib/tests/test_context.py =================================================================== ---- saltbundlepy-passlib-1.7.4-build.orig/passlib-1.7.4/passlib/tests/test_context.py -+++ saltbundlepy-passlib-1.7.4-build/passlib-1.7.4/passlib/tests/test_context.py +--- passlib-1.7.4.orig/passlib/tests/test_context.py ++++ passlib-1.7.4/passlib/tests/test_context.py @@ -13,6 +13,7 @@ import datetime from functools import partial import logging; log = logging.getLogger(__name__) -- 2.51.1 From 348192c3f9a8df1ff415c5c71e84e320bb078dbc9373e17b32e62ceb5f4efce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= Date: Tue, 13 Jan 2026 10:22:59 +0000 Subject: [PATCH 3/3] Skip additional flaky test on s390x --- saltbundlepy-passlib.changes | 2 +- skip_flaky_test_on_s390x.patch | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/saltbundlepy-passlib.changes b/saltbundlepy-passlib.changes index 1b47f13..8bd2108 100644 --- a/saltbundlepy-passlib.changes +++ b/saltbundlepy-passlib.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Jan 13 09:40:38 UTC 2026 - Pablo Suárez Hernández -- Skip flaky "test_dummy_verify" test on s390x +- Skip flaky tests on s390x ------------------------------------------------------------------- Wed Jul 16 14:58:00 UTC 2025 - Victor Zhestkov diff --git a/skip_flaky_test_on_s390x.patch b/skip_flaky_test_on_s390x.patch index 418d850..4c698ac 100644 --- a/skip_flaky_test_on_s390x.patch +++ b/skip_flaky_test_on_s390x.patch @@ -30,3 +30,39 @@ Index: passlib-1.7.4/passlib/tests/test_context.py def test_dummy_verify(self): """ dummy_verify() method +Index: passlib-1.7.4/passlib/tests/test_totp.py +=================================================================== +--- passlib-1.7.4.orig/passlib/tests/test_totp.py ++++ passlib-1.7.4/passlib/tests/test_totp.py +@@ -5,9 +5,11 @@ + # core + import datetime + from functools import partial ++import os + import logging; log = logging.getLogger(__name__) + import sys + import time as _time ++import unittest + # site + # pkg + from passlib import exc +@@ -53,6 +55,11 @@ KEY4_RAW = b'Hello!\xde\xad\xbe\xef' + assert sys.float_info.radix == 2, "unexpected float_info.radix" + assert sys.float_info.mant_dig >= 44, "double precision unexpectedly small" + ++skip_on_s390x = unittest.skipIf( ++ hasattr(os, 'uname') and os.uname().machine == 's390x', ++ 'skipped on s390x' ++) ++ + def _get_max_time_t(): + """ + helper to calc max_time_t constant (see below) +@@ -359,6 +366,7 @@ class AppWalletTest(TestCase): + # XXX: might want to allow this, but documenting behavior for now + self.assertRaises(ValueError, wallet.encrypt_key, b"") + ++ @skip_on_s390x + def test_encrypt_cost_timing(self): + """verify cost parameter via timing""" + self.require_aes_support() -- 2.51.1