From 2318128cf3365e0445988e1cae29e0274955e1dd Mon Sep 17 00:00:00 2001 From: Eric Garver Date: Mon, 19 May 2025 16:13:29 -0400 Subject: [PATCH] test: add scale keyword to scale tests Resolves: RHEL-68661 --- ...est-add-scale-keyword-to-scale-tests.patch | 46 +++++++++++++++++++ firewalld.spec | 6 ++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0026-v2.4.0-test-add-scale-keyword-to-scale-tests.patch diff --git a/0026-v2.4.0-test-add-scale-keyword-to-scale-tests.patch b/0026-v2.4.0-test-add-scale-keyword-to-scale-tests.patch new file mode 100644 index 0000000..685361e --- /dev/null +++ b/0026-v2.4.0-test-add-scale-keyword-to-scale-tests.patch @@ -0,0 +1,46 @@ +From 3a306425ecdc2b6024449404cfffaa1b11234e24 Mon Sep 17 00:00:00 2001 +From: Eric Garver +Date: Thu, 21 Nov 2024 09:21:51 -0500 +Subject: [PATCH 26/31] v2.4.0: test: add scale keyword to scale tests + +This allows skipping scale tests or running them separately. + +e.g. skip + + # make check TESTSUITEFLAGS="-j6 -k !scale" + +e.g. run scale tests separately and serially + + # make check TESTSUITEFLAGS="-k scale" + +(cherry picked from commit 106d3df926296163ed8a2aa7f924b4eb55b7b24f) +--- + src/tests/regression/ipset_scale.at | 2 +- + src/tests/regression/rhbz1871298.at | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/tests/regression/ipset_scale.at b/src/tests/regression/ipset_scale.at +index 2ceef1a56816..0aef986434f0 100644 +--- a/src/tests/regression/ipset_scale.at ++++ b/src/tests/regression/ipset_scale.at +@@ -1,5 +1,5 @@ + FWD_START_TEST([ipset scale]) +-AT_KEYWORDS(ipset gh738) ++AT_KEYWORDS(ipset gh738 scale) + + dnl Create a huge ipset + AT_CHECK([touch ./entries], 0, [ignore]) +diff --git a/src/tests/regression/rhbz1871298.at b/src/tests/regression/rhbz1871298.at +index 3a40e2a5ae13..e9fcfe69cf88 100644 +--- a/src/tests/regression/rhbz1871298.at ++++ b/src/tests/regression/rhbz1871298.at +@@ -1,5 +1,5 @@ + FWD_START_TEST([rich rule parsing bottleneck]) +-AT_KEYWORDS(rich offline rhbz1871298) ++AT_KEYWORDS(rich offline rhbz1871298 scale) + + AT_SKIP_IF([! NS_CMD([which timeout >/dev/null 2>&1])]) + +-- +2.48.1 + diff --git a/firewalld.spec b/firewalld.spec index 298a669..a319b37 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,7 +1,7 @@ Summary: A firewall daemon with D-Bus interface providing a dynamic firewall Name: firewalld Version: 1.3.4 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://www.firewalld.org License: GPLv2+ Source0: https://github.com/firewalld/firewalld/releases/download/v%{version}/firewalld-%{version}.tar.bz2 @@ -30,6 +30,7 @@ Patch22: 0022-v2.2.0-chore-service-remove-Conflicts-with-nftables.patch Patch23: 0023-v2.2.0-fix-service-update-highest-port-number-for-ce.patch Patch24: 0024-v2.2.0-feat-service-x-rootd-file-server.patch Patch25: 0025-v2.3.0-test-functions-fix-iptables-normalization-for.patch +Patch26: 0026-v2.4.0-test-add-scale-keyword-to-scale-tests.patch BuildArch: noarch BuildRequires: autoconf BuildRequires: automake @@ -253,6 +254,9 @@ rm -rf %{buildroot}%{_datadir}/firewalld/testsuite %{_mandir}/man1/firewall-config*.1* %changelog +* Mon May 19 2025 Eric Garver - 1.3.4-11 +- test: add scale keyword to scale tests + * Mon May 19 2025 Eric Garver - 1.3.4-10 - test(functions): fix iptables normalization for opt field