From 3aebb472e9321c4d623c8de2762984eec9cb1a07 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Wed, 24 Jun 2020 10:03:30 -0400 Subject: [PATCH] Improvements to go-xcat testcase --- 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 8f1523ef8..dd7b22185 100644 --- a/xCAT-test/autotest/testcase/go_xcat/case3 +++ b/xCAT-test/autotest/testcase/go_xcat/case3 @@ -130,9 +130,9 @@ check:output=~running #Update to devel version of xCAT cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=devel -y update" -check:rc==0 -cmd:xdsh $$CN "cat /tmp/go-xcat.log" -cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -a" +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" +cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v" check:rc==0 cmd:xdsh $$CN "service xcatd status" check:rc==0