From 2bb628a6c40b0494b6c5995e16b2e7d76fedd1a1e406adad2bb81bed06a0556e Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 11 Aug 2021 09:19:36 +0000 Subject: [PATCH] - Increase WEBSOCKETS_TESTS_TIMEOUT_FACTOR to 10 to make test_keepalive_ping_with_no_ping_timeout pass again. - Remove skip-test_keepalive_ping_with_no_ping_timeout.patch, of course. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-websockets?expand=0&rev=29 --- python-websockets.changes | 7 +++++++ python-websockets.spec | 5 +---- ..._keepalive_ping_with_no_ping_timeout.patch | 21 ------------------- 3 files changed, 8 insertions(+), 25 deletions(-) delete mode 100644 skip-test_keepalive_ping_with_no_ping_timeout.patch diff --git a/python-websockets.changes b/python-websockets.changes index 3be03de..19c7f2e 100644 --- a/python-websockets.changes +++ b/python-websockets.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 11 09:17:13 UTC 2021 - Matej Cepl + +- Increase WEBSOCKETS_TESTS_TIMEOUT_FACTOR to 10 to make + test_keepalive_ping_with_no_ping_timeout pass again. +- Remove skip-test_keepalive_ping_with_no_ping_timeout.patch, of course. + ------------------------------------------------------------------- Tue Aug 10 07:18:14 UTC 2021 - Matej Cepl diff --git a/python-websockets.spec b/python-websockets.spec index 7b74d11..d2d594d 100644 --- a/python-websockets.spec +++ b/python-websockets.spec @@ -26,9 +26,6 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/aaugustin/websockets Source: https://github.com/aaugustin/websockets/archive/%{version}.tar.gz -# PATCH-FIX-UPSTREAM skip-test_keepalive_ping_with_no_ping_timeout.patch gh#aaugustin/websockets#1026 mcepl@suse.com -# Skip test test_keepalive_ping_with_no_ping_timeout -Patch0: skip-test_keepalive_ping_with_no_ping_timeout.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -58,7 +55,7 @@ export CFLAGS="%{optflags}" %check # Test execution speed depends on BS load and architecture, relax -export WEBSOCKETS_TESTS_TIMEOUT_FACTOR=5 +export WEBSOCKETS_TESTS_TIMEOUT_FACTOR=10 # https://github.com/aaugustin/websockets/issues/855 is an intermittent failure # for test_keepalive_ping_does_not_crash_when_connection_lost on s390x %pyunittest_arch -v diff --git a/skip-test_keepalive_ping_with_no_ping_timeout.patch b/skip-test_keepalive_ping_with_no_ping_timeout.patch deleted file mode 100644 index f91a7e7..0000000 --- a/skip-test_keepalive_ping_with_no_ping_timeout.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - tests/legacy/test_protocol.py | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/tests/legacy/test_protocol.py -+++ b/tests/legacy/test_protocol.py -@@ -1,5 +1,6 @@ - import asyncio - import contextlib -+import platform - import sys - import unittest - import unittest.mock -@@ -1189,6 +1190,7 @@ class CommonTests: - self.loop.run_until_complete(asyncio.sleep(4 * MS)) - self.assertNoFrameSent() - -+ @unittest.skipIf(platform.processor() == 'x86_64', 'gh#aaugustin/websockets#1026') - def test_keepalive_ping_with_no_ping_timeout(self): - self.restart_protocol_with_keepalive_ping(ping_timeout=None) -