From 1e37bfa3871c79057d6418d0696eeead03ec4578 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Jul 27 2019 15:52:59 +0000 Subject: Fixed iptables test for c8 Signed-off-by: Fabian Arrotin --- diff --git a/tests/p_iptables/iptables_add-remove_test.sh b/tests/p_iptables/iptables_add-remove_test.sh index 13cccfe..f778d40 100755 --- a/tests/p_iptables/iptables_add-remove_test.sh +++ b/tests/p_iptables/iptables_add-remove_test.sh @@ -3,7 +3,7 @@ t_Log "Running $0 - verify iptables can insert and delete rules" -if [ "$centos_ver" = "7" ];then +if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ];then t_Log "CentOS $centos_ver uses firewalld and not iptables -> SKIP" t_CheckExitStatus 0 exit 0 diff --git a/tests/p_iptables/iptables_default_rules.sh b/tests/p_iptables/iptables_default_rules.sh index 82965f6..3ec7151 100755 --- a/tests/p_iptables/iptables_default_rules.sh +++ b/tests/p_iptables/iptables_default_rules.sh @@ -3,7 +3,7 @@ t_Log "Running $0 - check iptables default rules" -if [ "$centos_ver" = "7" ];then +if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ];then t_Log "CentOS $centos_ver uses firewalld and not iptables -> SKIP" t_CheckExitStatus 0 exit 0 diff --git a/tests/p_iptables/iptables_function-check_test.sh b/tests/p_iptables/iptables_function-check_test.sh index 68cf6cb..5f4f3c9 100755 --- a/tests/p_iptables/iptables_function-check_test.sh +++ b/tests/p_iptables/iptables_function-check_test.sh @@ -4,7 +4,7 @@ t_Log "Running $0 - iptables functional check - deny ping on loopback" -if [ "$centos_ver" = "7" ];then +if [ "$centos_ver" = "7" ] || [ "$centos_ver" = "8" ];then t_Log "CentOS $centos_ver uses firewalld and not iptables -> SKIP" t_CheckExitStatus 0 exit 0 diff --git a/tests/p_iptables/iptables_kmod_loaded.sh b/tests/p_iptables/iptables_kmod_loaded.sh index 00a0a6e..97f54aa 100755 --- a/tests/p_iptables/iptables_kmod_loaded.sh +++ b/tests/p_iptables/iptables_kmod_loaded.sh @@ -3,7 +3,7 @@ t_Log "Running $0 - check if iptables kernel modules are loaded" -if [ "$centos_ver" = "7" ];then +if [ "$centos_ver" = "7" ]|| [ "$centos_ver" = "8" ];then t_Log "CentOS $centos_ver uses firewalld and not iptables -> SKIP" t_CheckExitStatus 0 exit 0