From 4bd21ff38705d8e80f7edfb1c905845292a58994 Mon Sep 17 00:00:00 2001
From: huweihua <huweihua@cn.ibm.com>
Date: Thu, 24 May 2018 02:31:49 -0400
Subject: [PATCH] Modify some error or typo in some old cases

---
 xCAT-test/autotest/testcase/chtab/cases0    |  2 +-
 xCAT-test/autotest/testcase/chvm/cases0     | 12 ++++++++++--
 xCAT-test/autotest/testcase/mkdef/cases0    |  4 ++--
 xCAT-test/autotest/testcase/nodech/cases0   |  2 +-
 xCAT-test/autotest/testcase/xcatsnap/cases0 |  2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/xCAT-test/autotest/testcase/chtab/cases0 b/xCAT-test/autotest/testcase/chtab/cases0
index 0567dd9b2..cedb96420 100644
--- a/xCAT-test/autotest/testcase/chtab/cases0
+++ b/xCAT-test/autotest/testcase/chtab/cases0
@@ -61,7 +61,7 @@ start:chtab_err_table
 description:chtab with error table
 cmd:chtab error=error site.comment=error
 check:rc!=0
-check:output=~no such column
+check:output=~no such column|column \"error\" does not exist
 end
 
 
diff --git a/xCAT-test/autotest/testcase/chvm/cases0 b/xCAT-test/autotest/testcase/chvm/cases0
index 61bddffd2..61f76fc9b 100644
--- a/xCAT-test/autotest/testcase/chvm/cases0
+++ b/xCAT-test/autotest/testcase/chvm/cases0
@@ -44,7 +44,15 @@ check:rc!=0
 check:output=~Usage
 end
 start:chvm_err_node
-cmd:chvm testnode
+cmd:dir="/tmp/chvm_err_node";echo ${dir}".old";if [ -d "${dir}" ];then mv ${dir} ${dir}".old"; fi; mkdir -p $dir
+check:rc==0
+cmd:lsdef bogusnode > /dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef bogusnode -z >/tmp/chvm_err_node/bogusnode.stanza ;rmdef bogusnode;fi
+check:rc==0
+cmd:chvm bogusnode 
 check:rc!=0
-check:output=~Usage
+check:output=~Error: Invalid nodes and/or groups in noderange
+cmd:if [[ -e /tmp/chvm_err_node/bogusnode.stanza ]]; then cat /tmp/chvm_err_node/bogusnode.stanza | mkdef -z;fi
+check:rc==0
+cmd:dir="/tmp/chvm_err_node"; rm -rf $dir; if [ -d ${dir}".old" ];then mv ${dir}".old" $dir; fi
+check:rc==0
 end
diff --git a/xCAT-test/autotest/testcase/mkdef/cases0 b/xCAT-test/autotest/testcase/mkdef/cases0
index 547992ffd..af33335c1 100644
--- a/xCAT-test/autotest/testcase/mkdef/cases0
+++ b/xCAT-test/autotest/testcase/mkdef/cases0
@@ -294,8 +294,8 @@ check:rc==0
 check:output=~1 object definitions have been created or modified
 cmd:lsdef auto_test_cec_node
 check:output=~Object name\: auto\_test\_cec\_node
-check:output=~groups\=test\_template\_priority
-check:output!=groups\=cec\,all
+check:output!=groups\=test\_template\_priority
+check:output=~groups\=cec\,all
 check:output=~hwtype\=cec
 check:output=~mgt\=hmc
 check:output=~nodetype\=ppc
diff --git a/xCAT-test/autotest/testcase/nodech/cases0 b/xCAT-test/autotest/testcase/nodech/cases0
index 7857848db..8529b4a8c 100644
--- a/xCAT-test/autotest/testcase/nodech/cases0
+++ b/xCAT-test/autotest/testcase/nodech/cases0
@@ -173,7 +173,7 @@ end
 
 start:nodech_d_error
 description:nodech --delete
-cmd:chdef -t node -o testnode os=hello
+cmd:chdef -t node -o testnode os=hello groups=test
 check:rc==0
 cmd:nodech --delete
 check:rc!=0
diff --git a/xCAT-test/autotest/testcase/xcatsnap/cases0 b/xCAT-test/autotest/testcase/xcatsnap/cases0
index 8e374578c..3c336f61c 100644
--- a/xCAT-test/autotest/testcase/xcatsnap/cases0
+++ b/xCAT-test/autotest/testcase/xcatsnap/cases0
@@ -29,7 +29,7 @@ start:xcatsnap_v
 description:xcatsnap -v and --version
 cmd:xcatsnap -v
 check:output=~version|Version
-cmd:xcatsnamp --version
+cmd:xcatsnap --version
 check:output=~version|Version
 end