* [LTP] [PATCH 1/2] network/tcp_cmds/rwho: fix/cleanup test
@ 2016-06-27 13:17 Alexey Kodanev
2016-06-27 13:17 ` [LTP] [PATCH 2/2] network/xinetd: " Alexey Kodanev
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Alexey Kodanev @ 2016-06-27 13:17 UTC (permalink / raw)
To: ltp
Basically, we need to check if rhost and lhost are listed with
rwho and ruptime. Output parsing with sed is not really needed.
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
testcases/network/tcp_cmds/rwho/rwho01 | 199 +++++++++++---------------------
1 files changed, 69 insertions(+), 130 deletions(-)
diff --git a/testcases/network/tcp_cmds/rwho/rwho01 b/testcases/network/tcp_cmds/rwho/rwho01
index dc194e9..9842aba 100755
--- a/testcases/network/tcp_cmds/rwho/rwho01
+++ b/testcases/network/tcp_cmds/rwho/rwho01
@@ -1,152 +1,91 @@
#!/bin/sh
+# Copyright (c) 2016 Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (c) International Business Machines Corp., 2000
#
-# Copyright (c) International Business Machines Corp., 2000
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
-# the GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# PURPOSE: To test the basic functionality of the rwhod daemon using the
+# `rwho` and `ruptime` commands.
#
-#
-#
-# FILE : rwho
-#
-# PURPOSE: To test the basic functionality of the rwhod daemon using the
-# `rwho` and `ruptime` commands.
-#
-# SETUP: The home directory of root on the machine exported as "RHOST"
-# MUST have a ".rhosts" file with the hostname of the machine
-# where the test is executed. Also, both machines MUST have
-# the rwhod daemon installed. However, it does not need to be
-# active, the test will handle this.
-#
-# HISTORY:
-# 06/09 Manoj Iyer manjo@mail.utexas.edu
-# - Modified to use test harness API and also fix defects
-# 03/01 Robbie Williamson (robbiew@us.ibm.com)
-# -Ported
-#
-#
-#==============================================================================
-# error codes: 0 rwho/ruptime successful
-# 1 rwho failed no local and remote host in file
-# 2 ruptime failed no local and remote host in file
-#==============================================================================
-#-----------------------------------------------------------------------
-#
-# FUNCTION: do_setup
-#
-#-----------------------------------------------------------------------
+TCID=rwho01
+TST_TOTAL=25
+TST_CLEANUP="do_cleanup"
-LHOST_PID=""
-RHOST_PID=""
+. test_net.sh
+
+LHOST_PID=
+RHOST_PID=
do_setup()
{
- TCtmp=${TCtmp:-$LTPROOT/testcases/bin/$TC${EXEC_SUFFIX}$$}
-
- SLEEPTIME=${SLEEPTIME:-5}
- NUMLOOPS=${NUMLOOPS:-25}
- OUTFILE=${OUTFILE:-$TCtmp/${TC}.out}
-
- tst_setup
-
- exists awk cut hostname killall ps rsh rwho
-
- LHOST=`hostname | cut -f1 -d.`
- RHOST=${RHOST:-$LHOST}
-
- trap do_cleanup EXIT
-
- if ! pgrep -x rwhod > /dev/null; then
- tst_resm TINFO "Starting rwhod on $LHOST"
- rwhod || end_testcase "Unable to start rwhod on $LHOST"
- LHOST_PID=$(pgrep -x rwhod)
- sleep $SLEEPTIME
- fi
-
- if [ "$(rsh -n -l root $RHOST pgrep -x rwhod)" == "" ]; then
- tst_resm TINFO "Starting rwhod on $RHOST"
- rsh -n -l root $RHOST /usr/sbin/rwhod
- RHOST_PID=$(rsh -n -l root $RHOST pgrep -x rwhod)
- if [ -z "$RHOST_PID" ]; then
- end_testcase "Unable to start rwhod on $RHOST"
- fi
- sleep $SLEEPTIME
- fi
-
- RHOSTNAME=`rsh -n -l root $RHOST hostname | cut -f1 -d.`
- if [ -z "$RHOSTNAME" ]; then
- end_testcase "Unable to determine RHOSTNAME"
- fi
+ tst_check_cmds cut hostname killall rwho ruptime
+
+ LHOST=$(hostname | cut -f1 -d.)
+
+ pgrep -x rwhod > /dev/null
+ if [ $? -ne 0 ]; then
+ tst_resm TINFO "Starting rwhod on $LHOST"
+ ROD rwhod
+ LHOST_PID=$(pgrep -x rwhod)
+ [ -z "$LHOST_PID" ] && \
+ tst_brkm TBROK "Unable to start rwhod on $LHOST"
+ fi
+
+ tst_rhost_run -c "pgrep -x rwhod" > /dev/null
+ if [ $? -ne 0 ]; then
+ tst_resm TINFO "Starting rwhod on $RHOST"
+ tst_rhost_run -s -c "rwhod"
+ RHOST_PID=$(tst_rhost_run -c "pgrep -x rwhod")
+ [ -z "$RHOST_PID" ] && \
+ tst_brkm TBROK "Unable to start rwhod on $RHOST"
+ fi
+
+ RHOSTNAME=$(tst_rhost_run -c "hostname | cut -f1 -d.")
+ [ "$RHOSTNAME" ] || tst_brkm TBROK "Unable to determine RHOSTNAME"
}
-#-----------------------------------------------------------------------
-#
-# FUNCTION: do_test
-#
-#-----------------------------------------------------------------------
-
do_test()
{
- while [ $TST_COUNT -le $NUMLOOPS ]; do
- rwho -a > $OUTFILE
- HOST=`grep $LHOST $OUTFILE | sed 's/[^ ]* *//; s/:.*//' | uniq`
- [ "$HOST" = "$LHOST" ] || end_testcase "$LHOST is not in rwho outfile"
- HOST=`grep $RHOSTNAME $OUTFILE | sed 's/[^ ]* *//; s/:.*//' | uniq`
- [ "$HOST" = "$RHOSTNAME" ] || end_testcase "$RHOSTNAME is not in rwho outfile"
-
- ruptime -a > $OUTFILE
- HOST=`grep $LHOST $OUTFILE | sed 's/ .*//' | uniq`
- [ "$HOST" = "$LHOST" ] || end_testcase "$LHOST is not in ruptime outfile"
- HOST=`grep $RHOSTNAME $OUTFILE | sed 's/ .*//' | uniq`
- [ "$HOST" = "$RHOSTNAME" ] || end_testcase "$RHOSTNAME is not in ruptime outfile"
-
- tst_resm TINFO "Test $TST_COUNT of $NUMLOOPS complete"
- incr_tst_count
- done
+ rwho -a | grep -q $LHOST || \
+ tst_brkm TFAIL "$LHOST isn't in rwho output"
+ rwho -a | grep -q $RHOSTNAME || \
+ tst_brkm TFAIL "$RHOSTNAME isn't in rwho output"
+ ruptime -a | grep -q $LHOST || \
+ tst_brkm TFAIL "$LHOST is not in ruptime outfile"
+ ruptime -a | grep -q $RHOSTNAME || \
+ tst_brkm TFAIL "$RHOSTNAME is not in ruptime outfile"
}
-#-----------------------------------------------------------------------
-#
-# FUNCTION: do_cleanup
-#
-#-----------------------------------------------------------------------
-
do_cleanup()
{
- if [ -n "$LHOST_PID" ]; then
- tst_resm TINFO "Stopping rwhod on $LHOST"
- killall rwhod
- fi
-
- if [ -n "$RHOST_PID" ]; then
- tst_resm TINFO "Stopping rwhod on $RHOST"
- rsh -n -l root $RHOST "killall rwhod"
- fi
-
- tst_cleanup
+ if [ "$LHOST_PID" ]; then
+ tst_resm TINFO "Stopping rwhod on $LHOST"
+ killall rwhod
+ fi
+
+ if [ "$RHOST_PID" ]; then
+ tst_resm TINFO "Stopping rwhod on $RHOST"
+ tst_rhost_run -c "killall rwhod"
+ fi
}
-#-----------------------------------------------------------------------
-#
-# FUNCTION: MAIN
-#
-#-----------------------------------------------------------------------
-. net_cmdlib.sh
-
-read_opts $*
do_setup
-do_test
-do_cleanup
-end_testcase
+
+for i in $(seq 1 $TST_TOTAL); do
+ do_test
+ tst_resm TPASS "Test $i/$TST_COUNT complete"
+done
+
+tst_exit
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [LTP] [PATCH 2/2] network/xinetd: fix/cleanup test
2016-06-27 13:17 [LTP] [PATCH 1/2] network/tcp_cmds/rwho: fix/cleanup test Alexey Kodanev
@ 2016-06-27 13:17 ` Alexey Kodanev
2016-07-26 14:22 ` Cyril Hrubis
2016-07-26 14:11 ` [LTP] [PATCH 1/2] network/tcp_cmds/rwho: " Cyril Hrubis
2016-07-28 11:46 ` Alexey Kodanev
2 siblings, 1 reply; 8+ messages in thread
From: Alexey Kodanev @ 2016-06-27 13:17 UTC (permalink / raw)
To: ltp
The telnet output might slightly differ across various OS.
Check only relevant inforamtion with grep.
Remove tst_retry() as it seems redundant for this test.
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
---
testcases/network/xinetd/xinetd_tests.sh | 451 ++++++------------------------
1 files changed, 80 insertions(+), 371 deletions(-)
diff --git a/testcases/network/xinetd/xinetd_tests.sh b/testcases/network/xinetd/xinetd_tests.sh
index e50a511..fb43448 100755
--- a/testcases/network/xinetd/xinetd_tests.sh
+++ b/testcases/network/xinetd/xinetd_tests.sh
@@ -1,114 +1,42 @@
#!/bin/sh
-################################################################################
-## ##
-## Copyright (c) International Business Machines Corp., 2001 ##
-## ##
-## This program is free software; you can redistribute it and#or modify ##
-## it under the terms of the GNU General Public License as published by ##
-## the Free Software Foundation; either version 2 of the License, or ##
-## (at your option) any later version. ##
-## ##
-## This program is distributed in the hope that it will be useful, but ##
-## WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY ##
-## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ##
-## for more details. ##
-## ##
-## You should have received a copy of the GNU General Public License ##
-## along with this program; if not, write to the Free Software ##
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
-## ##
-################################################################################
+# Copyright (c) 2016 Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (c) International Business Machines Corp., 2001
#
-# File : xinetd_tests.sh
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
#
-# Description: Test Basic functionality of xinetd command.
-# Test #1: xinetd starts programs that provide Internet services.
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# Author: Manoj Iyer, manjo@mail.utexas.edu
-#
-# History: Mar 04 2003 - Created - Manoj Iyer.
-#
-# Function: chk_ifexists
-#
-# Description: - Check if command required for this test exits.
-#
-# Input: - $1 - calling test case.
-# - $2 - command that needs to be checked.
-#
-# Return: - zero on success.
-# - non-zero on failure.
-chk_ifexists()
-{
- which $2 > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_brkm TBROK NULL "$1: command $2 not found."
- fi
- return $RC
-}
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+TCID=xinetd
+TST_TOTAL=2
+TST_CLEANUP="cleanup"
-# Function: init
-#
-# Description: - Check if command required for this test exits.
-# - Create temporary directories required for this test.
-# - Initialize global variables.
-#
-# Return: - zero on success.
-# - non-zero on failure.
-init()
-{
- # Initialize global variables.
- export TST_TOTAL=2
- export TCID="xinetd"
- export TST_COUNT=0
- . daemonlib.sh
-
- if [ -f "/usr/lib/systemd/system/telnet.socket" ]; then
- tst_brkm TCONF NULL "xinetd doesn't manage telnet"
- exit $?
- fi
+. daemonlib.sh
+. test_net.sh
- # Inititalize cleanup function.
- trap "cleanup" 0
-
- # create the temporary directory used by this testcase
- if [ -z $TMP ]
- then
- LTPTMP=/tmp/tst_xinetd.$$
- else
- LTPTMP=$TMP/tst_xinetd.$$
- fi
-
- mkdir -p $LTPTMP > /dev/null 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_brkm TBROK NULL "INIT: Unable to create temporary directory"
- return $RC
- fi
+setup()
+{
+ [ -f "/usr/lib/systemd/system/telnet.socket" ] && \
+ tst_brkm TCONF "xinetd doesn't manage telnet"
- # sometimes the default telnet may be /usr/kerberos/bin/telnet
- TELNET_COMM='/usr/bin/telnet'
+ tst_tmpdir
- # check if commands tst_*, xinetd, awk exists.
- chk_ifexists INIT tst_resm || return $RC
- chk_ifexists INIT xinetd || return $RC
- chk_ifexists INIT diff || return $RC
- chk_ifexists INIT ip || return $RC
- chk_ifexists INIT $TELNET_COMM || return $RC
+ tst_check_cmds xinetd diff ip telnet
- IPV6_ENABLED=0
- ip a | grep inet6 > /dev/null 2>&1
- if [ $? -eq 0 ]
- then
- IPV6_ENABLED=1
- fi
+ check_addr="127.0.0.1"
+ ip a | grep -q inet6 && check_addr="$check_addr ::1"
- # Create custom xinetd.conf file.
- # tst_xinetd.conf.1 config file has telnet service disabled.
- cat > $LTPTMP/tst_xinetd.conf.1 <<-EOF
+ # Create custom xinetd.conf file.
+ # tst_xinetd.conf.1 config file has telnet service disabled.
+ cat > tst_xinetd.conf.1 <<-EOF
defaults
{
instances = 25
@@ -118,10 +46,8 @@ defaults
disabled = telnet
}
EOF
-RC=$?
- # tst_xinetd.conf.2 config file has telnet enabled.
- cat > $LTPTMP/tst_xinetd.conf.2 <<-EOF
+ cat > tst_xinetd.conf.2 <<-EOF
defaults
{
instances = 25
@@ -143,293 +69,76 @@ service telnet
flags = IPv6
}
EOF
-RC=$?
- # Create expected file with telnet disabled.
- cat > $LTPTMP/tst_xinetd.exp.1 <<-EOF
-telnet: connect to address 127.0.0.1: Connection refused
-EOF
-RC=$?
-
- if [ $RC -ne 0 ]
- then
- tst_brkm TBROK NULL \
- "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
- return $RC
- fi
-
- if [ $IPV6_ENABLED -eq 1 ]
- then
- cat > $LTPTMP/tst_xinetd.exp.1.ipv6 <<-EOF
-telnet: connect to address ::1: Connection refused
-EOF
-RC=$?
-
- if [ $RC -ne 0 ]
- then
- tst_brkm TBROK NULL \
- "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.1"
- fi
- fi
-
- # Create expected file with telnet enabled.
- cat > $LTPTMP/tst_xinetd.exp.2 <<-EOF
-Trying 127.0.0.1...
-Connected to 127.0.0.1.
-Escape character is '^]'.
-Connection closed by foreign host.
-EOF
-RC=$?
-
- if [ $RC -ne 0 ]
- then
- tst_brkm TBROK NULL \
- "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2"
- return $RC
- fi
-
- if [ $IPV6_ENABLED -eq 1 ]
- then
- cat > $LTPTMP/tst_xinetd.exp.2.ipv6 <<-EOF
-Trying ::1...
-Connected to ::1.
-Escape character is '^]'.
-Connection closed by foreign host.
-EOF
-RC=$?
-
- if [ $RC -ne 0 ]
- then
- tst_brkm TBROK NULL \
- "INIT: unable to create expected file $LTPTMP/tst_xinetd.exp.2.ipv6"
- fi
- fi
-
- return $RC
+ # create a backup of the original xinetd.conf file.
+ ROD mv /etc/xinetd.conf xinetd.conf.orig
}
-
-# Function: cleanup
-#
-# Description: - remove temporaty files and directories.
-#
-# Return: - zero on success.
-# - non-zero on failure.
cleanup()
{
- # restore the original xinetd.conf if a back up exits.
- if [ -f /etc/xinetd.conf.orig ]
- then
- mv /etc/xinetd.conf.orig /etc/xinetd.conf \
- > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TINFO $LTPTMP/tst_xinetd.err \
- "CLEANUP: failed restoring original xinetd.conf RC=$RC. Details:"
- fi
+ # restore the original xinetd.conf if a back up exits.
+ [ -f xinetd.conf.orig ] && \
+ mv xinetd.conf.orig /etc/xinetd.conf
- sleep 1s
+ # restoring original services
+ restart_daemon xinetd
- # restoring original services
- restart_daemon xinetd > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TINFO $LTPTMP/tst_xinetd.err \
- "CLEANUP: failed restoring original services RC=$RC. Details:"
- fi
- fi
-
- # remove all the temporary files created by this test.
- tst_resm TINFO "CLEAN: removing $LTPTMP"
- rm -fr $LTPTMP
+ tst_rmdir
}
+restart_xinetd()
+{
+ tst_resm TINFO "restart xinetd"
+ # restart xinetd to re-start the services
+ restart_daemon xinetd > tst_xinetd.out 2>&1
+ if [ $? -ne 0 ]; then
+ cat tst_xinetd.out
+ tst_brkm TBROK "unable to restart service with telnet disabled"
+ fi
+
+ # even if xinetd restart has zero exit value,
+ # make certain there was no failure.
+ grep -qi "fail" tst_xinetd.out && \
+ tst_brkm TBROK "xinetd failed to restart"
+}
-# Function: test01
-#
# Description: - Test that xinetd reads the configuration file and starts or
# stops services.
# - restart xinetd with configuration file with telnet disabled.
# - telnet to locahost should fail.
# - restart xinetd with configuration file with telnet enabled.
# - telnet to locahost should work.
-#
-# Return: - zero on success.
-# - non-zero on failure.
test01()
{
- TCID=xinetd01
- TST_COUNT=1
- nhops=0 # Number of hops required to get to host.
-
- tst_resm TINFO "Test #1: restart xinetd with telnet disabled."
-
- # create a backup of the original xinetd.conf file.
- mv /etc/xinetd.conf /etc/xinetd.conf.orig > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
- "Test #1: Failed while backing up original xinetd.conf. Details"
- return $RC
- fi
-
- # install the new config file with telnet disabled.
- mv $LTPTMP/tst_xinetd.conf.1 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
- "Test #1: Failed installing new xinetd.conf in /etc. Details:"
- return $RC
- fi
-
- tst_resm TINFO "Test #1: new xinetd.conf installed with telnet disabled."
-
- sleep 1s
-
- # restart xinetd to re-start the services
- restart_daemon xinetd > $LTPTMP/tst_xinetd.out 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.out \
- "Test #1: unable to restart service with telnet disabled. Details:"
- return $RC
- else
- # even if xinetd restart has zero exit value,
- # make certain there was no failure.
- grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -eq 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.err \
- "Test #1: xinetd failed to restart. Details"
- return $RC
- else
- RC=0
- tst_resm TINFO \
- "Test #1: xinetd re-started successfully with telnet disabled."
- fi
- fi
-
- # Not checking for exit code from telnet command because telnet is
- # not terminated by the test gracefully.
- if [ $IPV6_ENABLED -eq 1 ]
- then
- tst_retry "echo '\x04' | $TELNET_COMM ::1 2>$LTPTMP/tst_xinetd.out.ipv6 \
- 1>/dev/null"
- diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.1.ipv6 \
- > $LTPTMP/tst_xinetd.err.ipv6 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
- "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
- return $RC
- fi
- fi
-
- tst_retry "echo "\x04" | $TELNET_COMM 127.0.0.1 2>$LTPTMP/tst_xinetd.out \
- 1>/dev/null"
- diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.1 \
- > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.err \
- "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
- return $RC
- fi
-
- tst_resm TINFO "Test #1: restart xinetd with telnet enabled."
- # install the xinetd config file with telnet enabled.
- mv $LTPTMP/tst_xinetd.conf.2 /etc/xinetd.conf > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_brk TBROK $LTPTMP/tst_xinetd.err NULL \
- "Test #1: Failed installing new xinetd.conf in /etc. Details:"
- return $RC
- fi
-
- tst_resm TINFO "Test #1: new xinetd.conf installed with telnet enabled."
-
- sleep 1s
-
- # restart services.
- restart_daemon xinetd > $LTPTMP/tst_xinetd.out 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.out \
- "Test #1: unable to restart services with telnet enabled. Details:"
- return $RC
- else
- # even if restart has a zero exit value double check for failure.
- grep -i "fail" $LTPTMP/tst_xinetd.out > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -eq 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.err \
- "Test #1: xinetd failed to restart. Details"
- return $RC
- else
- RC=0
- tst_resm TINFO \
- "Test #1: xinetd re-started successfully with telnet enabled."
- fi
- fi
-
- # Not checking for exit code from telnet command because telnet is
- # not terminated by the test gracefully.
- if [ $IPV6_ENABLED -eq 1 ]
- then
- tst_retry "echo '\x04' | $TELNET_COMM ::1 2>$LTPTMP/tst_xinetd.out.ipv6 2>&1"
- diff -iwB $LTPTMP/tst_xinetd.out.ipv6 $LTPTMP/tst_xinetd.exp.2.ipv6 \
- > $LTPTMP/tst_xinetd.err.ipv6 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.err.ipv6 \
- "Test #1: with telnet diabled expected out differs RC=$RC. Details:"
- return $RC
- else
- tst_resm TPASS \
- "Test #1: xinetd reads the config file and starts or stops IPv6 services."
- fi
- fi
-
- test_retry "echo '\x04' | $TELNET_COMM 127.0.0.1 2>$LTPTMP/tst_xinetd.out 2>&1"
-
- diff -iwB $LTPTMP/tst_xinetd.out $LTPTMP/tst_xinetd.exp.2 \
- > $LTPTMP/tst_xinetd.err 2>&1
- RC=$?
- if [ $RC -ne 0 ]
- then
- tst_res TFAIL $LTPTMP/tst_xinetd.err \
- "Test #1: expected output differes from actual. Details:"
- return $RC
- else
- tst_resm TPASS \
- "Test #1: xinetd reads the config file and starts or stops services."
- fi
-
- return $RC
+ tst_resm TINFO "install the new config file with telnet disabled"
+ ROD mv tst_xinetd.conf.1 /etc/xinetd.conf
+ restart_xinetd
+
+ for a in $check_addr; do
+ echo '\x04' | telnet $a 2>&1 | grep -qi \
+ "telnet: connect to address $a: Connection refused"
+ [ $? -ne 0 ] && \
+ tst_brkm TFAIL "not expected output for 'telnet $a'"
+ done
+
+ tst_resm TPASS "expected output with telnet disabled"
+
+ tst_resm TINFO "install the xinetd config file with telnet enabled"
+ ROD mv tst_xinetd.conf.2 /etc/xinetd.conf
+ restart_xinetd
+
+ for a in $check_addr; do
+ echo '\x04' | telnet $a 2>&1 | grep -qi \
+ "Connection closed by foreign host"
+ [ $? -ne 0 ] && \
+ tst_brkm TFAIL "not expected output for 'telnet $a'"
+ done
+
+ tst_resm TPASS "expected output with telnet enabled"
}
+setup
-# Function: main
-#
-# Description: - Execute all tests and report results.
-#
-# Exit: - zero on success
-# - non-zero on failure.
-
-init || exit $?
-
-test01 || RC=$?
+test01
-exit $RC
+tst_exit
--
1.7.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [LTP] [PATCH 1/2] network/tcp_cmds/rwho: fix/cleanup test
2016-06-27 13:17 [LTP] [PATCH 1/2] network/tcp_cmds/rwho: fix/cleanup test Alexey Kodanev
2016-06-27 13:17 ` [LTP] [PATCH 2/2] network/xinetd: " Alexey Kodanev
@ 2016-07-26 14:11 ` Cyril Hrubis
2016-07-27 11:02 ` Alexey Kodanev
2016-07-28 11:46 ` Alexey Kodanev
2 siblings, 1 reply; 8+ messages in thread
From: Cyril Hrubis @ 2016-07-26 14:11 UTC (permalink / raw)
To: ltp
Hi!
> +for i in $(seq 1 $TST_TOTAL); do
> + do_test
> + tst_resm TPASS "Test $i/$TST_COUNT complete"
> +done
I do not understand why we run the test in a loop now 25 times,
otherwise it looks good.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 8+ messages in thread
* [LTP] [PATCH 2/2] network/xinetd: fix/cleanup test
2016-06-27 13:17 ` [LTP] [PATCH 2/2] network/xinetd: " Alexey Kodanev
@ 2016-07-26 14:22 ` Cyril Hrubis
2016-07-27 11:14 ` Alexey Kodanev
0 siblings, 1 reply; 8+ messages in thread
From: Cyril Hrubis @ 2016-07-26 14:22 UTC (permalink / raw)
To: ltp
Hi!
> +setup()
> +{
> + [ -f "/usr/lib/systemd/system/telnet.socket" ] && \
> + tst_brkm TCONF "xinetd doesn't manage telnet"
Hmm, there are still major distributions that were released in
pre-systemd times and will be maintained a few more years.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 8+ messages in thread
* [LTP] [PATCH 1/2] network/tcp_cmds/rwho: fix/cleanup test
2016-07-26 14:11 ` [LTP] [PATCH 1/2] network/tcp_cmds/rwho: " Cyril Hrubis
@ 2016-07-27 11:02 ` Alexey Kodanev
0 siblings, 0 replies; 8+ messages in thread
From: Alexey Kodanev @ 2016-07-27 11:02 UTC (permalink / raw)
To: ltp
On 07/26/2016 05:11 PM, Cyril Hrubis wrote:
> Hi!
>> +for i in $(seq 1 $TST_TOTAL); do
>> + do_test
>> + tst_resm TPASS "Test $i/$TST_COUNT complete"
>> +done
> I do not understand why we run the test in a loop now 25 times,
> otherwise it looks good.
We always do this, what we had before is a while loop:
while [ $TST_COUNT -le $NUMLOOPS ]; do
...
where NUMLOOPS was 25.
Thanks,
Alexey
^ permalink raw reply [flat|nested] 8+ messages in thread
* [LTP] [PATCH 2/2] network/xinetd: fix/cleanup test
2016-07-26 14:22 ` Cyril Hrubis
@ 2016-07-27 11:14 ` Alexey Kodanev
2016-07-27 11:42 ` Cyril Hrubis
0 siblings, 1 reply; 8+ messages in thread
From: Alexey Kodanev @ 2016-07-27 11:14 UTC (permalink / raw)
To: ltp
On 07/26/2016 05:22 PM, Cyril Hrubis wrote:
> Hi!
>> +setup()
>> +{
>> + [ -f "/usr/lib/systemd/system/telnet.socket" ] && \
>> + tst_brkm TCONF "xinetd doesn't manage telnet"
> Hmm, there are still major distributions that were released in
> pre-systemd times and will be maintained a few more years.
This was added by this patch:
54305b28 "network/xinetd: TCONF if telnet managed by systemd"
Thanks,
Alexey
^ permalink raw reply [flat|nested] 8+ messages in thread
* [LTP] [PATCH 2/2] network/xinetd: fix/cleanup test
2016-07-27 11:14 ` Alexey Kodanev
@ 2016-07-27 11:42 ` Cyril Hrubis
0 siblings, 0 replies; 8+ messages in thread
From: Cyril Hrubis @ 2016-07-27 11:42 UTC (permalink / raw)
To: ltp
Hi!
> >> + [ -f "/usr/lib/systemd/system/telnet.socket" ] && \
> >> + tst_brkm TCONF "xinetd doesn't manage telnet"
> > Hmm, there are still major distributions that were released in
> > pre-systemd times and will be maintained a few more years.
>
> This was added by this patch:
>
> 54305b28 "network/xinetd: TCONF if telnet managed by systemd"
My bad, I've misread the short circut evaluation.
--
Cyril Hrubis
chrubis@suse.cz
^ permalink raw reply [flat|nested] 8+ messages in thread
* [LTP] [PATCH 1/2] network/tcp_cmds/rwho: fix/cleanup test
2016-06-27 13:17 [LTP] [PATCH 1/2] network/tcp_cmds/rwho: fix/cleanup test Alexey Kodanev
2016-06-27 13:17 ` [LTP] [PATCH 2/2] network/xinetd: " Alexey Kodanev
2016-07-26 14:11 ` [LTP] [PATCH 1/2] network/tcp_cmds/rwho: " Cyril Hrubis
@ 2016-07-28 11:46 ` Alexey Kodanev
2 siblings, 0 replies; 8+ messages in thread
From: Alexey Kodanev @ 2016-07-28 11:46 UTC (permalink / raw)
To: ltp
Hi,
Applied patch-set.
Best regards,
Alexey
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2016-07-28 11:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-27 13:17 [LTP] [PATCH 1/2] network/tcp_cmds/rwho: fix/cleanup test Alexey Kodanev
2016-06-27 13:17 ` [LTP] [PATCH 2/2] network/xinetd: " Alexey Kodanev
2016-07-26 14:22 ` Cyril Hrubis
2016-07-27 11:14 ` Alexey Kodanev
2016-07-27 11:42 ` Cyril Hrubis
2016-07-26 14:11 ` [LTP] [PATCH 1/2] network/tcp_cmds/rwho: " Cyril Hrubis
2016-07-27 11:02 ` Alexey Kodanev
2016-07-28 11:46 ` Alexey Kodanev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox