tests: Drop checks for iptables RPM

On one hand, the test will fail as the RPM is called 'iptables-nft' (or
'iptables-legacy', but that's not the default). On the other, if
iptables RPM is missing the commands will fail as well so this check
happens implicitly anyway.
This commit is contained in:
Phil Sutter 2023-10-10 19:23:45 +02:00
parent 97407d1230
commit 4407a0239c
12 changed files with 0 additions and 30 deletions

View File

@ -29,12 +29,10 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
IPSET=testset6 IPSET=testset6
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
# rlAssertRpm kernel # rlAssertRpm kernel
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"

View File

@ -29,12 +29,10 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
TESTD=$PWD TESTD=$PWD
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"
rlRun "source $TESTD/rules.in" 0 "read ruleset" rlRun "source $TESTD/rules.in" 0 "read ruleset"

View File

@ -29,7 +29,6 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
SERVICES="iptables ip6tables firewalld" SERVICES="iptables ip6tables firewalld"
prepare_page() { prepare_page() {
@ -42,7 +41,6 @@ prepare_page() {
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
# rlAssertRpm kernel # rlAssertRpm kernel
rlLogInfo $(uname -r) rlLogInfo $(uname -r)
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"

View File

@ -29,7 +29,6 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
CGNUM="15" CGNUM="15"
CGNAME="15" CGNAME="15"
CGDIR="/sys/fs/cgroup/net_cls/$CGNAME" CGDIR="/sys/fs/cgroup/net_cls/$CGNAME"
@ -41,7 +40,6 @@ SKIP6=false
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
# rlAssertRpm kernel-$(uname -r) # rlAssertRpm kernel-$(uname -r)
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"

View File

@ -29,11 +29,8 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"
rlPhaseEnd rlPhaseEnd

View File

@ -29,11 +29,8 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"
rlRun "ip6tables-save > ip6tables.backup" rlRun "ip6tables-save > ip6tables.backup"

View File

@ -29,11 +29,8 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"
rlRun "cp /etc/sysconfig/ip6tables ." rlRun "cp /etc/sysconfig/ip6tables ."

View File

@ -29,12 +29,10 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
SERVICES="iptables ip6tables firewalld" SERVICES="iptables ip6tables firewalld"
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"
for svc in $SERVICES; do for svc in $SERVICES; do

View File

@ -29,13 +29,11 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
IPSET4="ipsetv4" IPSET4="ipsetv4"
IPSET6="ipsetv6" IPSET6="ipsetv6"
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"
rlRun "ipset create $IPSET4 hash:ip" rlRun "ipset create $IPSET4 hash:ip"

View File

@ -29,11 +29,8 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"
rlServiceStart iptables rlServiceStart iptables

View File

@ -30,11 +30,8 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
rlJournalStart rlJournalStart
rlPhaseStartTest rlPhaseStartTest
rlAssertRpm $PACKAGE
rlRun "iptables-save -M /dev/null" 0 "iptables-save -M ... supported" rlRun "iptables-save -M /dev/null" 0 "iptables-save -M ... supported"
rlRun "iptables-save --modprobe /dev/null" 0 "iptables-save --modprobe ... supported" rlRun "iptables-save --modprobe /dev/null" 0 "iptables-save --modprobe ... supported"
rlPhaseEnd rlPhaseEnd

View File

@ -29,11 +29,8 @@
. /usr/bin/rhts-environment.sh || exit 1 . /usr/bin/rhts-environment.sh || exit 1
. /usr/share/beakerlib/beakerlib.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1
PACKAGE="iptables"
rlJournalStart rlJournalStart
rlPhaseStartSetup rlPhaseStartSetup
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
rlRun "pushd $TmpDir" rlRun "pushd $TmpDir"
rlPhaseEnd rlPhaseEnd