From 77e80ac3e343e43de081e2a266cbd1504e3f1ce0 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Fri, 26 Jun 2020 10:31:29 -0400 Subject: [PATCH] More improvements to go-xcat testcases --- xCAT-test/autotest/testcase/go_xcat/case3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-test/autotest/testcase/go_xcat/case3 b/xCAT-test/autotest/testcase/go_xcat/case3 index dd7b22185..c0170de2b 100644 --- a/xCAT-test/autotest/testcase/go_xcat/case3 +++ b/xCAT-test/autotest/testcase/go_xcat/case3 @@ -131,7 +131,7 @@ check:output=~running #Update to devel version of xCAT cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=devel -y update" cmd:version=`xdsh $$CN /opt/xcat/bin/lsxcatd -v`; if [[ $version =~ "Version" ]]; then echo "xCAT updated successfully first time"; else echo "First attempt to update xCAT failed, attempting to update xCAT again"; xdsh $$CN "cd /; ./go-xcat --xcat-version=devel -y update"; fi -check:output=~"xCAT updated successfully first time"|"xCAT has been successfully updated" +check:output=~xCAT updated successfully first time|xCAT has been successfully updated cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v" check:rc==0 cmd:xdsh $$CN "service xcatd status" @@ -191,8 +191,8 @@ check:output=~could not be found|dead|no such service xcatd #Install devel version of xCAT cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=devel -y install" -check:rc==0 -cmd:xdsh $$CN "cat /tmp/go-xcat.log" +cmd:version=`xdsh $$CN /opt/xcat/bin/lsxcatd -v`; if [[ $version =~ "Version" ]]; then echo "xCAT installed successfully first time"; else echo "First attempt to install xCAT failed, attempting to install xCAT again"; xdsh $$CN "cd /; ./go-xcat -y --xcat-version=devel install"; fi +check:output=~xCAT updated successfully first time|xCAT has been successfully updated cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -a" check:rc==0 cmd:xdsh $$CN "service xcatd status"