diff options
| author | Martin Schwenke <martin@meltin.net> | 2011-08-19 11:35:38 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-30 16:51:55 +1000 |
| commit | 7d7851dd45488f9851618b7281af7d427c265ec2 (patch) | |
| tree | fab8c3e8d244b230d8efa132e8d88810886ad5f7 | |
| parent | 62f2d160ac2faf31a551441b90b216dcf4c15d84 (diff) | |
| download | samba-7d7851dd45488f9851618b7281af7d427c265ec2.tar.gz samba-7d7851dd45488f9851618b7281af7d427c265ec2.tar.xz samba-7d7851dd45488f9851618b7281af7d427c265ec2.zip | |
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>
(This used to be ctdb commit f19ba38e382034fba769145d0bfc81b2c2941563)
| -rw-r--r-- | ctdb/tests/eventscripts/common.sh | 6 | ||||
| -rwxr-xr-x | ctdb/tests/eventscripts/stubs/netstat | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/tests/eventscripts/common.sh b/ctdb/tests/eventscripts/common.sh index ab7abb9fac..f57df4eab7 100644 --- a/ctdb/tests/eventscripts/common.sh +++ b/ctdb/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/ctdb/tests/eventscripts/stubs/netstat b/ctdb/tests/eventscripts/stubs/netstat index cf0656651a..5a3e3c7e77 100755 --- a/ctdb/tests/eventscripts/stubs/netstat +++ b/ctdb/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 |