From f0e31c0bd580ece30f9570b92aa2bb783eed8fcd Mon Sep 17 00:00:00 2001 From: mio Date: Sat, 28 Mar 2026 03:10:02 +0000 Subject: [PATCH] main/py3-pexpect: skip test Revert fix for `test_10000`, the test is flaky in some setups. --- main/py3-pexpect/APKBUILD | 6 +++--- main/py3-pexpect/test-100000-searchwindowsize.patch | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 main/py3-pexpect/test-100000-searchwindowsize.patch diff --git a/main/py3-pexpect/APKBUILD b/main/py3-pexpect/APKBUILD index 6fca4d1a026..64bf9176e39 100644 --- a/main/py3-pexpect/APKBUILD +++ b/main/py3-pexpect/APKBUILD @@ -14,7 +14,6 @@ checkdepends="py3-pytest bash coreutils" subpackages="$pkgname-pyc" source="$pkgname-$pkgver.tar.gz::https://github.com/pexpect/$_pkgname/archive/$pkgver.tar.gz py314.patch - test-100000-searchwindowsize.patch " builddir="$srcdir/$_pkgname-$pkgver" @@ -29,10 +28,12 @@ check() { _tests_colors="not test_async_replwrap_multiline and not REPLWrapTestCase" # tests that deadlock _tests_hang="and not test_interrupt and not test_multiple_interrupts" + # test that is flaky/times out e.g. on s390x + _tests_flaky="and not test_100000" python3 -m venv --clear --without-pip --system-site-packages .testenv .testenv/bin/python3 -m installer .dist/*.whl - .testenv/bin/python3 -m pytest -v -k "$_tests_colors $_tests_hang" + .testenv/bin/python3 -m pytest -v -k "$_tests_colors $_tests_hang $_tests_flaky" } package() { @@ -43,5 +44,4 @@ package() { sha512sums=" 222aa3a2aba174f1f9c9e5bbf71aa59fbc1c1830fce6691ecb01ec4f0613b1f2141da489a6bd7bfd226f46d98d52a16e1f5a5b7345bcf6557110bfd52cd5f31e py3-pexpect-4.9.tar.gz 7da559986ec5c8491191834005ac37a1bf302e9e099c2cbac2a61aa16430e7df283c21be58d07ef565a810ab43eda2a41df3db08e6344075bc7aae9bdc73e953 py314.patch -588b64243644243be77640a3f4358a24b1b1ebef6f8a255e422e0c8d75b58cb44f3c0c6946df5d82819ee5f0ac1846d0da6ed8df0f4a602326fdafa460eba2b3 test-100000-searchwindowsize.patch " diff --git a/main/py3-pexpect/test-100000-searchwindowsize.patch b/main/py3-pexpect/test-100000-searchwindowsize.patch deleted file mode 100644 index e41a5429b05..00000000000 --- a/main/py3-pexpect/test-100000-searchwindowsize.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN a/tests/test_performance.py b/tests/test_performance.py ---- a/tests/test_performance.py 2023-11-25 05:24:37.000000000 +0000 -+++ b/tests/test_performance.py 2026-03-03 19:49:03.740000000 +0000 -@@ -58,7 +58,7 @@ class PerformanceTestCase (PexpectTestCa - e.sendline(self._iter_n(n)) - self.assertEqual(e.expect(r'\.{3}'), 0) - e.sendline(b'') -- self.assertEqual(e.expect([b'inquisition', '%d' % n], searchwindowsize=20), 1) -+ self.assertEqual(e.expect([b'inquisition', '%d' % n], searchwindowsize=40), 1) - - def exact_range(self, n): - e = pexpect.spawn(sys.executable, timeout=100)