From beb9c1e519c979f20ad62136f97cd2e1f70d6749 Mon Sep 17 00:00:00 2001 From: caomengmeng Date: Tue, 25 Oct 2016 11:46:14 +0800 Subject: [PATCH] update the value check method again --- xCAT-test/autotest/testcase/xcatconfig/case0 | 25 ++++++++++---------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/xCAT-test/autotest/testcase/xcatconfig/case0 b/xCAT-test/autotest/testcase/xcatconfig/case0 index 16b6bd966..b434e4101 100644 --- a/xCAT-test/autotest/testcase/xcatconfig/case0 +++ b/xCAT-test/autotest/testcase/xcatconfig/case0 @@ -90,32 +90,33 @@ end start:xcatconfig_u_check_xcatsslversion_rhels_sles description:after xcatconfig -u the site.xcatsslversion will not be changed -cmd:default_value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$default_value" = "TLSv1" ]; then echo "xcatsslversion default value is TLSv1"; else echo "xcatsslversion is $default_value"; fi -check:output=~xcatsslversion default value is TLSv1 +cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1$' +check:rc==0 cmd:chtab key=xcatsslversion site.value=TLSv12 check:rc==0 -cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv12" ]; then echo "xcatsslversion is changed to be TLSv12"; else echo "xcatsslversion is $value"; fi -check:output=~xcatsslversion is changed to be TLSv12 +cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv12$' +check:rc==0 cmd:xcatconfig -u check:rc==0 -cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv12" ]; then echo "xcatsslversion is still TLSv12"; else echo "xcatsslversion is $value"; fi -check:output=~xcatsslversion is still TLSv12 +cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv12$' +check:rc==0 cmd:chtab key=xcatsslversion site.value=TLSv1 check:rc==0 end + start:xcatconfig_u_check_xcatsslversion_ubuntu description:after xcatconfig -u the site.xcatsslversion will not be changed -cmd:default_value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$default_value" = "TLSv1" ]; then echo "xcatsslversion default value is TLSv1"; else echo "xcatsslversion is $default_value"; fi -check:output=~xcatsslversion default value is TLSv1 +cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1$' +check:rc==0 cmd:chtab key=xcatsslversion site.value=TLSv1_2 check:rc==0 -cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv1_2" ]; then echo "xcatsslversion is changed to be TLSv1_2"; else echo "xcatsslversion is $value"; fi -check:output=~xcatsslversion is changed to be TLSv1_2 +cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1_2$' +check:rc==0 cmd:xcatconfig -u check:rc==0 -cmd:value=`tabdump site | grep xcatsslversion | awk -F '"' '{print $4}'`; if [ "$value" = "TLSv1_2" ]; then echo "xcatsslversion is still TLSv1_2"; else echo "xcatsslversion is $value"; fi -check:output=~xcatsslversion is still TLSv1_2 +cmd:lsdef -t site -i xcatsslversion -c | grep '=TLSv1_2$' +check:rc==0 cmd:chtab key=xcatsslversion site.value=TLSv1 check:rc==0 end