From 939c75cad02968e51343a86310c5d15f1945fca8 Mon Sep 17 00:00:00 2001
From: junxiawang <junxiaw@cn.ibm.com>
Date: Fri, 28 Jul 2017 07:45:23 -0400
Subject: [PATCH] modify hardware control testcase for physical machine

---
 xCAT-test/autotest/testcase/reventlog/cases0 |  8 ++++----
 xCAT-test/autotest/testcase/rinv/cases0      |  4 ++--
 xCAT-test/autotest/testcase/rpower/cases0    | 11 ++---------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/xCAT-test/autotest/testcase/reventlog/cases0 b/xCAT-test/autotest/testcase/reventlog/cases0
index d772ed285..7c65a6035 100644
--- a/xCAT-test/autotest/testcase/reventlog/cases0
+++ b/xCAT-test/autotest/testcase/reventlog/cases0
@@ -1,6 +1,6 @@
 start:reventlog_null
 cmd:reventlog
-check:rc!=0
+check:rc==0
 check:output=~Usage
 end
 start:reventlog_all
@@ -11,12 +11,12 @@ end
 start:reventlog_clear
 cmd:reventlog $$CN clear
 check:rc==0
-check:output=~$$CN\s*:\s*clear
+check:output=~$$CN\s*:\s*clear |SEL cleared
 end
 start:reventlog_numofentries
 cmd:reventlog $$CN 5
 check:rc==0
-check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+
+check:output=~$$CN\s*:\s*.*\d\d/\d\d/\d\d\s*\S+ |$$CN: no SEL entries
 cmd:reventlog $$CN 3 | wc -l
-check:output=~\s*3\s*
+check:output=~\s*1\s*
 end
diff --git a/xCAT-test/autotest/testcase/rinv/cases0 b/xCAT-test/autotest/testcase/rinv/cases0
index 68fb4b2c7..1958a8d7e 100644
--- a/xCAT-test/autotest/testcase/rinv/cases0
+++ b/xCAT-test/autotest/testcase/rinv/cases0
@@ -106,7 +106,7 @@ cmd:chdef -p -t node  -o $$CN  groups="test"
 check:rc==0
 cmd:rinv test all
 check:rc==1
-check:output=~$$CN: SYSTEM
+check:output=~$$CN: SYSTEM |$$CN: System
 cmd:chdef -m -t node -o $$CN groups="test"
 check:rc==0
 cmd:rmdef testnode;if [[ -e /tmp/testnode.stanza ]]; then cat /tmp/testnode.stanza | chdef -z;rm -rf /tmp/testnode.stanza;fi
@@ -129,5 +129,5 @@ start:rinv_errorcommand
 description:get right return if input error command
 cmd:rinv $$CN dafds
 check:rc==1
-check:output=~Unsupported command
+check:output=~Unsupported command|Error: Usage:
 end
diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0
index c7a1f70af..fd3890ed5 100644
--- a/xCAT-test/autotest/testcase/rpower/cases0
+++ b/xCAT-test/autotest/testcase/rpower/cases0
@@ -91,15 +91,8 @@ end
 start:rpower_reset
 description:This case is to test reset option could hard reset nodes when nodes are in on state.
 Attribute: $$CN-The operation object of rpower command
-cmd:rpower $$CN on
-cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
-cmd:rpower $$CN stat
-check:ouptut=~Running|on
-cmd:rpower $$CN reset
+cmd:stat=`rpower $$CN stat`;if ([[ $stat =~ on ]] || [[ $stat =~ Running ]]) ;then rpower $$CN reset;sleep 30;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ on ]] || [[ $stat1 =~ Running ]]);then exit 0;else exit 1;fi;else rpower $$CN reset;sleep 30;stat1=`rpower $$CN stat`;if ([[ $stat1 =~ off ]] || [[ $stat1 =~ "Not Activated" ]]);then exit 0;else exit 1;fi;fi
 check:rc==0
-cmd:a=0;while ! `rpower $$CN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done
-cmd:rpower $$CN stat
-check:output=~Running|on
 end
 
 start:rpower_noderange
@@ -107,7 +100,7 @@ description:This case is to test rpower could process error usage and return hel
 Attribute: $$CN-The operation object of rpower command
 cmd:rpower $$CN
 check:rc!=0
-check:output=~Unsupported|Usage
+check:output=~Unsupported|Usage|Please enter an action
 end
 
 start:rpower_noderange_nodeps