Tests - Change variable used to fake listening TCP ports.

Change from $FAKE_NETSTAT_TCP_LISTEN to $FAKE_TCP_LISTEN.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/tests/eventscripts/common.sh b/tests/eventscripts/common.sh
index ab7abb9faca9449cc4adcf4a18fc91000cd90ae0..f57df4eab781b7ac7ce23c031eb88f639455a894 100644 (file)
--- a/tests/eventscripts/common.sh
+++ b/tests/eventscripts/common.sh
@@ -109,7 +109,7 @@ tcp_port_down ()
 {
     for _i ; do
        debug "Marking TCP port \"${_i}\" as not listening"
-       FAKE_NETSTAT_TCP_LISTEN=$(echo "$FAKE_NETSTAT_TCP_LISTEN" | sed -r -e "s@[[:space:]]*[\.0-9]+:${_i}@@g")
+       FAKE_TCP_LISTEN=$(echo "$FAKE_TCP_LISTEN" | sed -r -e "s@[[:space:]]*[\.0-9]+:${_i}@@g")
     done
 }
 
@@ -303,7 +303,7 @@ setup_samba ()
        export CTDB_SAMBA_SKIP_SHARE_CHECK="no"
        export CTDB_MANAGED_SERVICES="foo samba winbind bar"
 
-       export FAKE_NETSTAT_TCP_LISTEN="0.0.0.0:445 0.0.0.0:139"
+       export FAKE_TCP_LISTEN="0.0.0.0:445 0.0.0.0:139"
        export FAKE_WBINFO_FAIL="no"
     else
        debug "Marking Samba services as down, not listening and not managed by CTDB"
@@ -321,7 +321,7 @@ setup_samba ()
        unset CTDB_MANAGES_SAMBA
        unset CTDB_MANAGES_WINBIND
 
-       export FAKE_NETSTAT_TCP_LISTEN=""
+       export FAKE_TCP_LISTEN=""
        export FAKE_WBINFO_FAIL="yes"
     fi
 

diff --git a/tests/eventscripts/stubs/netstat b/tests/eventscripts/stubs/netstat
index cf0656651aa499089f9c08bfa30f440556becf67..5a3e3c7e77e9216eb5736da11f397217fbdb108a 100755 (executable)
--- a/tests/eventscripts/stubs/netstat
+++ b/tests/eventscripts/stubs/netstat
@@ -8,7 +8,7 @@ usage ()
 Usage: $prog [ -t | --unix ] [ -n ] [ -a ] [ -l ]
 
 A fake netstat stub that prints items depending on the variables
-FAKE_NETSTAT_TCP_ESTABLISHED, FAKE_NETSTAT_TCP_LISTEN,
+FAKE_NETSTAT_TCP_ESTABLISHED, FAKE_TCP_LISTEN,
 FAKE_NETSTAT_UNIX_LISTEN, depending on command-line options.
 
 Note that -n is ignored.
@@ -73,7 +73,7 @@ if $tcp ; then
     done
 
     if $all || $listen ; then
-       for i in $FAKE_NETSTAT_TCP_LISTEN ; do
+       for i in $FAKE_TCP_LISTEN ; do
            printf "$tcp_fmt" $i "0.0.0.0:*" "LISTEN"
        done
     fi