From 0e0584e4239599a077ef5d670cf95a9ef225249e Mon Sep 17 00:00:00 2001 From: "litingt@cn.ibm.com" Date: Sat, 24 Mar 2018 12:00:21 -0400 Subject: [PATCH] Fix bugs of go-xcat test cases,Modify go-xcat test cases #21 --- xCAT-test/autotest/testcase/go-xcat/case1 | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/xCAT-test/autotest/testcase/go-xcat/case1 b/xCAT-test/autotest/testcase/go-xcat/case1 index 00d9381a1..bb936f73a 100644 --- a/xCAT-test/autotest/testcase/go-xcat/case1 +++ b/xCAT-test/autotest/testcase/go-xcat/case1 @@ -50,11 +50,10 @@ check:rc==0 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi check:rc==0 cmd:rm -rf /tmp/go-xcat.log -cmd:xdsh $$CN "cd /; ./go-xcat -x $$MIGRATION2_VERSION -y install" +cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`; xdsh $$CN "cd /; ./go-xcat -x $migration_version -y install" check:rc==0 cmd:cat /tmp/go-xcat.log cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v" -check:output=~Version $$MIGRATION2_VERSION cmd:xdsh $$CN "service xcatd status" check:rc==0 check:output=~running @@ -118,12 +117,11 @@ check:rc==0 cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "apt-get clean && apt-get update"; fi check:rc==0 cmd:rm -rf /tmp/go-xcat.log -cmd:xdsh $$CN "cd /; ./go-xcat --xcat-version=$$MIGRATION2_VERSION -y install" +cmd:migration_version=`echo $$MIGRATION2_VERSION |cut -d "." -f -2`; xdsh $$CN "cd /; ./go-xcat --xcat-version=$migration_version -y install" check:rc==0 cmd:cat /tmp/go-xcat.log cmd:xdsh $$CN "source /etc/profile.d/xcat.sh;lsxcatd -v" check:rc==0 -check:output=~Version $$MIGRATION2_VERSION cmd:xdsh $$CN "service xcatd status" check:rc==0 check:output=~running @@ -134,4 +132,3 @@ cmd:if grep Ubuntu /etc/*release;then xdsh $$CN "dpkg -l |grep -i perl-xcat";els check:rc!=0 cmd:xdsh $$CN "cd /; rm -rf /go-xcat" end -