From 7265b3909f189f6022b42601d26901b30c1ec602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dirk=20M=C3=BCller?= Date: Wed, 13 Nov 2024 12:39:23 +0100 Subject: [PATCH] Avoid FIXME comments to make pylint happy --- tests/test_init.py | 2 +- tests/test_mariadb.py | 6 ++++-- tests/test_postgres.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/test_init.py b/tests/test_init.py index 52579d70..ea6ffc00 100644 --- a/tests/test_init.py +++ b/tests/test_init.py @@ -44,7 +44,7 @@ def test_systemd_no_udev_present(self, auto_container): def test_systemd_boottime(self, auto_container): """Ensure the container startup time is below 5 seconds""" - # FIXME: Temporary workaround: While using emulated workers, the startup time test doesn't make sense.' + # https://github.com/SUSE/BCI-tests/issues/647 if auto_container.connection.system_info.arch == "ppc64le": pytest.skip( "boottime test temporarily disabled on emulated ppc64le workers." diff --git a/tests/test_mariadb.py b/tests/test_mariadb.py index 4e07f33b..bbae0859 100644 --- a/tests/test_mariadb.py +++ b/tests/test_mariadb.py @@ -13,6 +13,7 @@ from pytest_container.container import container_and_marks_from_pytest_param from pytest_container.pod import Pod from pytest_container.pod import PodData +from pytest_container.runtime import LOCALHOST from pytest_container.runtime import OciRuntimeBase from tenacity import retry from tenacity import stop_after_attempt @@ -82,10 +83,11 @@ def _generate_test_matrix() -> List[ParameterSet]: return params -## FIXME Increased attempts from 5 to 8 due to https://github.com/SUSE/BCI-tests/issues/647 @retry( wait=wait_exponential(multiplier=1, min=4, max=10), - stop=stop_after_attempt(8), + stop=stop_after_attempt( + 8 if LOCALHOST.system_info.arch == "ppc64le" else 5 + ), ) def _wait_for_server(connection): connection.check_output("healthcheck.sh --connect") diff --git a/tests/test_postgres.py b/tests/test_postgres.py index 11d47ec2..d9de8391 100644 --- a/tests/test_postgres.py +++ b/tests/test_postgres.py @@ -68,7 +68,7 @@ def _generate_test_matrix() -> List[ParameterSet]: extra_launch_args=( ["--user", username] if username else [] ), - # FIXME https://github.com/SUSE/BCI-tests/issues/647 + # https://github.com/SUSE/BCI-tests/issues/647 healthcheck_timeout=( timedelta(minutes=3) if LOCALHOST.system_info.arch == "ppc64le"