From a04359273ebaf62551be0bd0416b07d19a58a1af Mon Sep 17 00:00:00 2001 From: besawn <38794505+besawn@users.noreply.github.com> Date: Wed, 27 Apr 2022 16:56:30 -0400 Subject: [PATCH] Fixed batch of xcattest testcase check:output typos --- xCAT-test/autotest/testcase/addkit/cases0 | 2 +- xCAT-test/autotest/testcase/chkkitcomp/cases0 | 2 +- xCAT-test/autotest/testcase/dockercommand/cases0 | 6 +++--- xCAT-test/autotest/testcase/lsvm/cases0 | 10 +++++----- xCAT-test/autotest/testcase/pdu/case0 | 2 +- xCAT-test/autotest/testcase/rpower/cases0 | 4 ++-- .../testcase/xcat_inventory/cases.common | 16 ++++++++-------- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/xCAT-test/autotest/testcase/addkit/cases0 b/xCAT-test/autotest/testcase/addkit/cases0 index dbdcedf55..6c671c113 100644 --- a/xCAT-test/autotest/testcase/addkit/cases0 +++ b/xCAT-test/autotest/testcase/addkit/cases0 @@ -12,7 +12,7 @@ label:others,KIT cmd:addkit -h check:rc==0 check:output=~Usage -check:outpur!~error +check:output!~error end start:addkit_kit diff --git a/xCAT-test/autotest/testcase/chkkitcomp/cases0 b/xCAT-test/autotest/testcase/chkkitcomp/cases0 index ec142db60..0a49410d9 100644 --- a/xCAT-test/autotest/testcase/chkkitcomp/cases0 +++ b/xCAT-test/autotest/testcase/chkkitcomp/cases0 @@ -12,7 +12,7 @@ label:others,KIT cmd:addkit -h check:rc==0 check:output=~Usage -check:outpur!~error +check:output!~error end start:chkkitcomp_V diff --git a/xCAT-test/autotest/testcase/dockercommand/cases0 b/xCAT-test/autotest/testcase/dockercommand/cases0 index 3446a4ca2..86aace6d2 100644 --- a/xCAT-test/autotest/testcase/dockercommand/cases0 +++ b/xCAT-test/autotest/testcase/dockercommand/cases0 @@ -9,9 +9,9 @@ cmd:mkdocker $$DOCKERCN image=$$DOCKERIMAGE command=$$DOCKERCOMMAND dockerflag= check:rc==0 cmd:rpower $$DOCKERCN stop check:rc==0 -check:ouptut=~container already stopped +check:output=~container already stopped cmd:rpower $$DOCKERCN restart -check:ouptut=~success +check:output=~success cmd:rpower $$DOCKERCN state check:rc==0 check:output=~running @@ -156,7 +156,7 @@ check:rc==0 cmd:rpower $$DOCKERCN start check:rc==0 cmd:rpower $$DOCKERCN pause -check:ouptut=~paused +check:output=~paused cmd:rpower $$DOCKERCN unpause check:rc==0 check:output=~success diff --git a/xCAT-test/autotest/testcase/lsvm/cases0 b/xCAT-test/autotest/testcase/lsvm/cases0 index f4dbb48a5..54075fe2b 100644 --- a/xCAT-test/autotest/testcase/lsvm/cases0 +++ b/xCAT-test/autotest/testcase/lsvm/cases0 @@ -33,7 +33,7 @@ description:lsvm -a/--all could work as design, to display all the information f label:others,hctrl_kvm 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 -check:ouptut=~Running|on +check:output=~Running|on cmd:lsvm $$CN check:rc==0 check:output=~$$CN: Id:\s*\w+ @@ -69,11 +69,11 @@ label:others,hctrl_kvm 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 +check:output=~Running|on cmd:rpower $$SN on cmd:a=0;while ! `rpower $$SN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done cmd:rpower $$SN stat -check:ouptut=~Running|on +check:output=~Running|on cmd:lsvm $$CN,$$SN check:rc==0 check:output=~$$CN: Id:\s*\w+ @@ -113,11 +113,11 @@ label:others,hctrl_kvm cmd:rpower $$CN off cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done cmd:rpower $$CN stat -check:ouptut=~Not Activated|off +check:output=~Not Activated|off cmd:rpower $$SN on cmd:a=0;while ! `rpower $$SN stat|grep "Running\|on" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done cmd:rpower $$SN stat -check:ouptut=~Running|on +check:output=~Running|on cmd:lsvm $$CN,$$SN check:output=~$$SN: Id:\s*\w+ check:output=~$$SN: Host:\s*\w+ diff --git a/xCAT-test/autotest/testcase/pdu/case0 b/xCAT-test/autotest/testcase/pdu/case0 index a03ff973c..fe605691e 100644 --- a/xCAT-test/autotest/testcase/pdu/case0 +++ b/xCAT-test/autotest/testcase/pdu/case0 @@ -190,6 +190,6 @@ check:output=~Error cmd:oldpdu=`cat /tmp/pduvalue`;chdef $$CN pdu=$oldpdu cmd:rpower $$CN pduof check:rc!=0 -check:outpu=~Unsupported command +check:output=~Unsupported command cmd:rmdef $$PDU end diff --git a/xCAT-test/autotest/testcase/rpower/cases0 b/xCAT-test/autotest/testcase/rpower/cases0 index f3dc326cf..1341f289a 100644 --- a/xCAT-test/autotest/testcase/rpower/cases0 +++ b/xCAT-test/autotest/testcase/rpower/cases0 @@ -144,7 +144,7 @@ Attribute: $$CN-The operation object of rpower command label:cn_bmc_ready,hctrl_fsp,hctrl_openbmc 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 -check:ouptut=~Running|on +check:output=~Running|on cmd:rpower $$CN softoff check:rc==0 cmd:a=0;while ! `rpower $$CN stat|grep "Not Activated\|off" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done @@ -164,7 +164,7 @@ cmd:rpower $$CN stat check:output=~Not Activated|off cmd:rpower $$CN onstandby cmd:a=0;while ! `rpower $$CN stat|grep "standby\|Standby" >/dev/null`; do sleep 5;((a++));if [ $a -gt 11 ];then break;fi done -check:ouptut=~standby|Standby +check:output=~standby|Standby end start:rpower_wrongpasswd diff --git a/xCAT-test/autotest/testcase/xcat_inventory/cases.common b/xCAT-test/autotest/testcase/xcat_inventory/cases.common index 59d68399b..be8aa375b 100644 --- a/xCAT-test/autotest/testcase/xcat_inventory/cases.common +++ b/xCAT-test/autotest/testcase/xcat_inventory/cases.common @@ -2,17 +2,17 @@ start:xcat_inventory_option_h description:This case is used to test xcat-inventory usage information label:others,inventory_ci cmd:xcat-inventory -h -check:ouptut=~usage: xcat-inventory -check:ouptut!~usage: xcat-inventory export -check:ouptut!~usage: xcat-inventory import +check:output=~usage: xcat-inventory +check:output!~usage: xcat-inventory export +check:output!~usage: xcat-inventory import check:rc==0 cmd:xcat-inventory help -check:ouptut=~usage: xcat-inventory -check:ouptut!~usage: xcat-inventory export -check:ouptut!~usage: xcat-inventory import +check:output=~usage: xcat-inventory +check:output!~usage: xcat-inventory export +check:output!~usage: xcat-inventory import check:rc==0 cmd:xcat-inventory help export -check:ouptut=~usage: xcat-inventory export +check:output=~usage: xcat-inventory export check:rc==0 cmd:xcat-inventory help import check:output=~usage: xcat-inventory import @@ -27,7 +27,7 @@ start:xcat_inventory_option_V description:This case is used to test xcat-inventory option V which used to get version information label:others,inventory_ci cmd:xcat-inventory -V -check:ouptut=~\d\.\d +check:output=~\d\.\d check:rc==0 end