Skip to contentSkip to conversation

rwho01: fix mistakes

PATCH In review Simon Xu 3 participants 6 messages Dec 19, 2013 – Feb 11, 2014

lore
Share & tools
lore

Simon Xu

author
#0 lore raw

PATCH 1/1 rwho01: fix mistakes

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(-)
testcases/network/tcp_cmds/rwho/rwho01 +12 -19
index eb31642..5f507ea 100755
@@ -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
Signature · 13 lines
1.8.4.2


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
author
#1 lore raw

Could anyone help to review this?

Thanks
Simon

Quoted 100 lines · Simon Xu

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(-)
testcases/network/tcp_cmds/rwho/rwho01 +11 -19
index eb31642..5f507ea 100755
@@ -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
-
  }
 
  #-----------------------------------------------------------------------

testcases/network/tcp_cmds/rwho/rwho01 do_cleanup() · line 150

Quoted 5 lines
testcases/network/tcp_cmds/rwho/rwho01 +1 -0
@@ -154,4 +146,5 @@ do_cleanup()
  read_opts $*
  do_setup
  do_test
+do_cleanup
  end_testcase

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

author
#2 lore raw

Could anyone help to review this?

Thanks
Simon

Quoted 104 lines · Simon Xu

Could anyone help to review this?

Thanks
Simon

Quoted 98 lines · Simon Xu

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(-)
testcases/network/tcp_cmds/rwho/rwho01 +11 -19
index eb31642..5f507ea 100755
@@ -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
-
   }
Quoted 7 lines

testcases/network/tcp_cmds/rwho/rwho01 do_cleanup() · line 150

Quoted 7 lines
testcases/network/tcp_cmds/rwho/rwho01 +1 -0
   #-----------------------------------------------------------------------

@@ -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

Tested-by
#3 lore raw

----- Original Message -----

Quoted 9 lines

From: "Simon Xu" <[email protected]>
To: [email protected]
Sent: Tuesday, 21 January, 2014 2:44:33 AM
Subject: Re: [LTP] [PATCH] rwho01: fix mistakes

Could anyone help to review this?

Thanks
Simon

Hi,

I tested your patch on RHEL5.3 and didn't come across any issues.

Tested-by Jan Stancek <[email protected]>

Regards,
Jan

Quoted 120 lines · Simon Xu
Quoted 108 lines

Could anyone help to review this?

Thanks
Simon

Quoted 102 lines · Simon Xu

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(-)
testcases/network/tcp_cmds/rwho/rwho01 +6 -7
index eb31642..5f507ea 100755
@@ -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

testcases/network/tcp_cmds/rwho/rwho01 +1 -4
+    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}')

testcases/network/tcp_cmds/rwho/rwho01 +4 -8
+        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
-
   }
Quoted 7 lines

testcases/network/tcp_cmds/rwho/rwho01 do_cleanup() · line 150

Quoted 7 lines
testcases/network/tcp_cmds/rwho/rwho01 +1 -0
   #-----------------------------------------------------------------------

@@ -154,4 +146,5 @@ do_cleanup()
   read_opts $*
   do_setup
   do_test
+do_cleanup
   end_testcase

------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.

Quoted 9 lines

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

------------------------------------------------------------------------------
WatchGuard Dimension instantly turns raw network data into actionable security intelligence. It gives you real-time visual feedback on key security issues and trends. Skip the complicated setup - simply import a virtual appliance and go from zero to informed in seconds.
http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

author
#4 lore raw
Quoted 9 lines · Jan Stancek

----- Original Message -----

Quoted 7 lines

From: "Simon Xu" <[email protected]>
To: [email protected]
Sent: Tuesday, 21 January, 2014 2:44:33 AM
Subject: Re: [LTP] [PATCH] rwho01: fix mistakes

Could anyone help to review this?

Quoted 7 lines
Quoted 2 lines

Thanks
Simon

Hi,

I tested your patch on RHEL5.3 and didn't come across any issues.

Tested-by Jan Stancek <[email protected]>

Thanks, I tested the patch on both RHEL5 and 6 before submitting it.

Thanks
Simon

Quoted 119 lines
Quoted 119 lines · Simon Xu
Quoted 108 lines

Could anyone help to review this?

Thanks
Simon

Quoted 102 lines · Simon Xu

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(-)
testcases/network/tcp_cmds/rwho/rwho01 +6 -7
index eb31642..5f507ea 100755
@@ -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

testcases/network/tcp_cmds/rwho/rwho01 +1 -4
+    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}')

testcases/network/tcp_cmds/rwho/rwho01 +4 -8
+        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
-
    }
Quoted 7 lines

testcases/network/tcp_cmds/rwho/rwho01 do_cleanup() · line 150

Quoted 7 lines
testcases/network/tcp_cmds/rwho/rwho01 +1 -0
    #-----------------------------------------------------------------------

@@ -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

Quoted 8 lines
Quoted 8 lines

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

------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list

#5 lore raw
In reply to Simon Xu

Hi!

Quoted 6 lines

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

I have added the tst_cleanup back to do_cleanup due to changes in 1e278ab7 and pushed, thanks.

Signature · 13 lines
Cyril Hrubis
[email protected]

------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience.  Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list