Could anyone help to review this? Thanks Simon
On 2013/12/25 9:45, Simon Xu wrote: > Could anyone help to review this? > > Thanks > Simon > > On 2013/12/19 14:43, Simon Xu wrote: >> 1) fix the way it checks whether rwhod is running >> 2) fix the way it checks whether rwhod is started on remote host >> 3) fix do_cleanup, and no need to call tst_cleanup() in do_cleanup() >> because it's called in end_testcase anyways >> 4) call do_cleanup() after do_test() >> 5) shorten sleep time to 5 seconds as 20 seconds are not necessary >> >> Signed-off-by: Simon Xu <[email protected]> >> --- >> testcases/network/tcp_cmds/rwho/rwho01 | 31 >> ++++++++++++------------------- >> 1 file changed, 12 insertions(+), 19 deletions(-) >> >> diff --git a/testcases/network/tcp_cmds/rwho/rwho01 >> b/testcases/network/tcp_cmds/rwho/rwho01 >> index eb31642..5f507ea 100755 >> --- a/testcases/network/tcp_cmds/rwho/rwho01 >> +++ b/testcases/network/tcp_cmds/rwho/rwho01 >> @@ -48,14 +48,14 @@ >> # >> #----------------------------------------------------------------------- >> >> +LHOST_PID="" >> +RHOST_PID="" >> + >> do_setup() >> { >> - >> TCtmp=${TCtmp:-$LTPROOT/testcases/bin/$TC${EXEC_SUFFIX}$$} >> >> - PID=0 >> - RHOST_PID=0 >> - SLEEPTIME=${SLEEPTIME:-20} >> + SLEEPTIME=${SLEEPTIME:-5} >> NUMLOOPS=${NUMLOOPS:-25} >> OUTFILE=${OUTFILE:-$TCtmp/${TC}.out} >> >> @@ -68,21 +68,18 @@ do_setup() >> >> trap do_cleanup EXIT >> >> - if ! ps -ef | awk '/rwhod/ && $0 !~ /awk/'; then >> + if ! pgrep -x rwhod > /dev/null; then >> tst_resm TINFO "Starting rwhod on $LHOST" >> rwhod || end_testcase "Unable to start rwhod on $LHOST" >> - PID=1 >> + LHOST_PID=$(pgrep -x rwhod) >> sleep $SLEEPTIME >> fi >> >> - if ! rsh -n -l root $RHOST ps -ef | awk '/rwhod/ && $0 !~ /awk/'; then >> + if [ "$(rsh -n -l root $RHOST pgrep -x rwhod)" == "" ]; then >> tst_resm TINFO "Starting rwhod on $RHOST" >> - if ! rsh -n -l root $RHOST /usr/sbin/rwhod; then >> - end_testcase "Unable to start rwhod on $RHOST" >> - fi >> - RHOST_PID=$(rsh -n -l root $RHOST ps -ef | awk '/rwhod/ && $0 !~ >> /awk/ {print $2 ; exit}') >> + rsh -n -l root $RHOST /usr/sbin/rwhod >> + RHOST_PID=$(rsh -n -l root $RHOST pgrep -x rwhod) >> if [ -z "$RHOST_PID" ]; then >> - RHOST_PID=0 >> end_testcase "Unable to start rwhod on $RHOST" >> fi >> sleep $SLEEPTIME >> @@ -92,7 +89,6 @@ do_setup() >> if [ -z "$RHOSTNAME" ]; then >> end_testcase "Unable to determine RHOSTNAME" >> fi >> - >> } >> >> #----------------------------------------------------------------------- >> @@ -103,7 +99,6 @@ do_setup() >> >> do_test() >> { >> - >> while [ $TST_COUNT -le $NUMLOOPS ]; do >> rwho -a > $OUTFILE >> HOST=`grep $LHOST $OUTFILE | sed 's/[^ ]* *//; s/:.*//' | uniq` >> @@ -130,18 +125,15 @@ do_test() >> >> do_cleanup() >> { >> - if [ $PID -ne 0 ]; then >> + if [ -n "$LHOST_PID" ]; then >> tst_resm TINFO "Stopping rwhod on $LHOST" >> killall rwhod >> fi >> >> - if [ $RHOST_PID -ne 0 ]; then >> + if [ -n "$RHOST_PID" ]; then >> tst_resm TINFO "Stopping rwhod on $RHOST" >> rsh -n -l root $RHOST "killall rwhod" >> fi >> - >> - tst_cleanup >> - >> } >> >> #----------------------------------------------------------------------- >> @@ -154,4 +146,5 @@ do_cleanup() >> read_opts $* >> do_setup >> do_test >> +do_cleanup >> end_testcase ------------------------------------------------------------------------------ CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
