diff --git a/xCAT-test/autotest/testcase/addkit/cases0 b/xCAT-test/autotest/testcase/addkit/cases0 index c69256c44..dbdcedf55 100644 --- a/xCAT-test/autotest/testcase/addkit/cases0 +++ b/xCAT-test/autotest/testcase/addkit/cases0 @@ -2,16 +2,16 @@ start:addkit_v label:others,KIT cmd:addkit -v check:rc==0 -check:output~=Version -check:output~=kitframework -check:output~=compatible_frameworks +check:output=~Version +check:output=~kitframework +check:output=~compatible_frameworks end start:addkit_h label:others,KIT cmd:addkit -h check:rc==0 -check:output~=Usage +check:output=~Usage check:outpur!~error end diff --git a/xCAT-test/autotest/testcase/chkkitcomp/cases0 b/xCAT-test/autotest/testcase/chkkitcomp/cases0 index 0e46d2b1f..ec142db60 100644 --- a/xCAT-test/autotest/testcase/chkkitcomp/cases0 +++ b/xCAT-test/autotest/testcase/chkkitcomp/cases0 @@ -2,16 +2,16 @@ start:chkkitcomp_v label:others,KIT cmd:chkkitcomp -v check:rc==0 -check:output~=Version -check:output~=kitframework -check:output~=compatible_frameworks +check:output=~Version +check:output=~kitframework +check:output=~compatible_frameworks end start:chkkitcomp_h label:others,KIT cmd:addkit -h check:rc==0 -check:output~=Usage +check:output=~Usage check:outpur!~error end diff --git a/xCAT-test/autotest/testcase/osdeploy/cases0 b/xCAT-test/autotest/testcase/osdeploy/cases0 index e362b1c26..c6255f399 100644 --- a/xCAT-test/autotest/testcase/osdeploy/cases0 +++ b/xCAT-test/autotest/testcase/osdeploy/cases0 @@ -3,9 +3,9 @@ description: osdeploy check usage label:others,xcatprobe cmd:xcatprobe osdeploy -h check:rc==0 -check:output~=Usage -check:output~=osdeploy -h -check:output~=Description +check:output=~Usage +check:output=~osdeploy -h +check:output=~Description end start:osdeploy_n @@ -85,7 +85,7 @@ cmd:test=`lsdef test_node`;if [ $test eq 0 ]; then lsdef -l test_node -z >/tmp/n check:rc==0 cmd:xcatprobe osdeploy -n test_node check:rc==1 -check:output~=without node definition +check:output=~without node definition cmd:if [ -e /tmp/node.stanza ]; then cat /tmp/node.stanza | mkdef -z; rm -rf /tmp/node.stanza; fi check:rc==0 end @@ -94,10 +94,10 @@ description:osdeploy -n node -p invalid parameter label:others,xcatprobe cmd:xcatprobe osdeploy -n $$CN -p dsdf check:rc==1 -check:output~=Usage: -check:output~="'compact': Elapsed time of provision for each node." -check:output~="'phase' : Elapsed time for DHCP, INSTALL, POSTSCRIPTS and POSTBOOTSCRIPTS stages, and time for whole provis" -check:output~="'origin' : Show origin start time of each stage." +check:output=~Usage: +check:output=~"'compact': Elapsed time of provision for each node." +check:output=~"'phase' : Elapsed time for DHCP, INSTALL, POSTSCRIPTS and POSTBOOTSCRIPTS stages, and time for whole provis" +check:output=~"'origin' : Show origin start time of each stage." end start:osdeploy_n_r_invalid @@ -105,10 +105,10 @@ description:osdeploy -n node -r invalid parameter label:others,xcatprobe cmd:xcatprobe osdeploy -n $$CN -r dadf check:rc==1 -check:output~=Usage: -check:output~="'compact': Elapsed time of provision for each node." -check:output~="'phase' : Elapsed time for DHCP, INSTALL, POSTSCRIPTS and POSTBOOTSCRIPTS stages, and time for whole provis" -check:output~="'origin' : Show origin start time of each stage." +check:output=~Usage: +check:output=~"'compact': Elapsed time of provision for each node." +check:output=~"'phase' : Elapsed time for DHCP, INSTALL, POSTSCRIPTS and POSTBOOTSCRIPTS stages, and time for whole provis" +check:output=~"'origin' : Show origin start time of each stage." end start:osdeploy_n_t_invalid @@ -116,10 +116,10 @@ description:osdeploy -n node -t invalid parameter label:others,xcatprobe cmd:xcatprobe osdeploy -n $$CN -t dadf check:rc==1 -check:output~=Usage: -check:output~="'compact': Elapsed time of provision for each node." -check:output~="'phase' : Elapsed time for DHCP, INSTALL, POSTSCRIPTS and POSTBOOTSCRIPTS stages, and time for whole provis" -check:output~="'origin' : Show origin start time of each stage." +check:output=~Usage: +check:output=~"'compact': Elapsed time of provision for each node." +check:output=~"'phase' : Elapsed time for DHCP, INSTALL, POSTSCRIPTS and POSTBOOTSCRIPTS stages, and time for whole provis" +check:output=~"'origin' : Show origin start time of each stage." end start:osdeploy_n_p_origin diff --git a/xCAT-test/autotest/testcase/xcat_inventory/cases.common b/xCAT-test/autotest/testcase/xcat_inventory/cases.common index 8572f59d5..59d68399b 100644 --- a/xCAT-test/autotest/testcase/xcat_inventory/cases.common +++ b/xCAT-test/autotest/testcase/xcat_inventory/cases.common @@ -84,17 +84,17 @@ diff -y --ignore-blank-lines --ignore-matching-lines="^#" /tmp/xcat_inventory_e check:rc==0 cmd:xcat-inventory export -t node -o bogusnode -f check:rc!=0 -check:output ~=usage -check:output ~= error: argument -f/--path: expected one argument +check:output =~usage +check:output =~ error: argument -f/--path: expected one argument cmd:xcat-inventory export -t node -o bogusnode --path check:rc!=0 -check:output ~=usage -check:output ~= error: argument -f/--path: expected one argument +check:output =~usage +check:output =~ error: argument -f/--path: expected one argument cmd:mkdir /tmp/xcat_inventory_export_option_f/testdir check:rc==0 cmd:xcat-inventory export -t node -o bogusnode -f /tmp/xcat_inventory_export_option_f/testdir check:rc!=0 -check:output ~= Error: the specified file /tmp/xcat_inventory_export_option_f/testdir already exists, is not a file! +check:output =~ Error: the specified file /tmp/xcat_inventory_export_option_f/testdir already exists, is not a file! cmd:rmdef bogusnode check:rc==0 cmd:if [[ -e /tmp/xcat_inventory_export_option_f/bogusnode.stanza ]]; then cat /tmp/xcat_inventory_export_option_f/bogusnode.stanza | mkdef -z;fi