[Audit-test-developer] [PATCH 06/26] netfilter, netfilebt: remove unnecessary sleeps

[Jiri J. <jja...@re...>]

Signed-off-by: Jiri Jaburek <jja...@re...>
---
 audit-test/netfilebt/run.conf |  4 +---
 audit-test/netfilter/run.conf | 14 ++++----------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/audit-test/netfilebt/run.conf b/audit-test/netfilebt/run.conf
index f2cff0d..02712f6 100644
--- a/audit-test/netfilebt/run.conf
+++ b/audit-test/netfilebt/run.conf
@@ -533,7 +533,7 @@ ebtables -A INPUT -p ipv6 --ip6-protocol ipv6-icmp --ip6-icmp-type neighbour-adv
 ebtables -N AUDIT_DROP
 ebtables -A AUDIT_DROP -j AUDIT --audit-type DROP
 ebtables -A AUDIT_DROP -j DROP
-sleep 1
+
 ebtables -N AUDIT_ACCEPT
 ebtables -A AUDIT_ACCEPT -j AUDIT --audit-type ACCEPT
 ebtables -A AUDIT_ACCEPT -j ACCEPT
@@ -600,7 +600,6 @@ function run_test {
     # run the
     # default setup
         ebtaudit_setup
-        sleep 4
         setup_default
 
         case $tnum in
@@ -701,7 +700,6 @@ function run_test {
                ebtables -A INPUT -d $LOCAL_SEC_MAC -j AUDIT_DROP
                  ;;
               *)
-               sleep 1
                echo "test case = $tnum"
                  ;;
         esac
diff --git a/audit-test/netfilter/run.conf b/audit-test/netfilter/run.conf
index 23740c6..af28b90 100644
--- a/audit-test/netfilter/run.conf
+++ b/audit-test/netfilter/run.conf
@@ -397,10 +397,10 @@ function setup_default {
 
        if [[ ! $xndpid ]]; then
           echo "starting local lblnet_tst_server"
-         ./do_netfilsvr.bash
+          ./do_netfilsvr.bash
+          sleep 1
        fi
     fi
-    sleep 1
 
     # generate the host command string
     remote_obj="$(get_label_obj $mlsop)"
@@ -553,7 +553,7 @@ iptables -A AUDIT_DROP -j DROP
 iptables -N AUDIT_REJECT
 iptables -A AUDIT_REJECT -j AUDIT --type REJECT
 iptables -A AUDIT_REJECT -j REJECT
-sleep 1
+
 iptables -N AUDIT_ACCEPT
 iptables -A AUDIT_ACCEPT -j AUDIT --type ACCEPT
 iptables -A AUDIT_ACCEPT -j ACCEPT
@@ -572,7 +572,7 @@ ip6tables -A AUDIT_DROP -j DROP
 ip6tables -N AUDIT_REJECT
 ip6tables -A AUDIT_REJECT -j AUDIT --type REJECT
 ip6tables -A AUDIT_REJECT -j REJECT
-sleep 1
+
 ip6tables -N AUDIT_ACCEPT
 ip6tables -A AUDIT_ACCEPT -j AUDIT --type ACCEPT
 ip6tables -A AUDIT_ACCEPT -j ACCEPT
@@ -649,7 +649,6 @@ function run_test {
     # default setup
         iptables_setup
         ip6tables_setup
-        sleep 3
         # exclude ping and RST tests
         if ! [[ $tnum -ge 29 && $tnum -le 36 ]] \
         && ! [[ $tnum -ge 45 && $tnum -le 46 ]]; then
@@ -765,20 +764,16 @@ function run_test {
                iptables -P INPUT DROP
                # add rule to make sure our ssh session stays alive
                iptables -A INPUT -p tcp --dport 22 -j ACCEPT
-               sleep 1
                iptables -A INPUT -p tcp -m multiport --dports 4000,$tst_port2 -j AUDIT_ACCEPT
                iptables -A INPUT -p tcp --dport 30000:60000 -j AUDIT_ACCEPT
-               sleep 1
                setup_default
                actv=0
                protov=6
                  ;;
            35 | 36)
                ip6tables -P INPUT DROP
-               sleep 1
                ip6tables -A INPUT -p tcp -m multiport --dports 4000,$tst_port2 -j AUDIT_ACCEPT
                ip6tables -A INPUT -p tcp --dport 30000:60000 -j AUDIT_ACCEPT
-               sleep 1
                setup_default
                actv=0
                protov=6
@@ -908,7 +903,6 @@ function run_test {
                ip6tables -A INPUT -i $LOCAL_DEV -j DROP
                  ;;
               *)
-               sleep 1
                echo "test case = $tnum"
                  ;;
         esac
-- 
1.8.3.1