From c76c3c0d451c42cae3c726e158cfebbfcc37e0bf Mon Sep 17 00:00:00 2001 From: tingtli Date: Wed, 16 Jan 2019 16:23:49 +0800 Subject: [PATCH] Refine cases rmdef_dynamic_group and lsdef_nics to reduce failure for environment (#5955) --- xCAT-test/autotest/testcase/lsdef/cases0 | 2 ++ xCAT-test/autotest/testcase/rmdef/cases0 | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/xCAT-test/autotest/testcase/lsdef/cases0 b/xCAT-test/autotest/testcase/lsdef/cases0 index dbd717f4f..7169dfa08 100644 --- a/xCAT-test/autotest/testcase/lsdef/cases0 +++ b/xCAT-test/autotest/testcase/lsdef/cases0 @@ -214,6 +214,7 @@ end start:lsdef_nics description:lsdef --nics label:mn_only,ci_test,db +cmd:lsdef testnode1;if [ $? -eq 0 ]; then lsdef -l testnode1 -z >/tmp/testnode1.standa ; rmdef testnode1;fi cmd:mkdef -t node -o testnode1 groups=all mgt=ipmi nicips.eth0=1.1.1.1 check:rc==0 cmd:lsdef testnode1 --nics @@ -223,6 +224,7 @@ cmd:rmdef testnode1 check:rc==0 cmd:lsdef testnode1 check:output=~Could not find +cmd:if [ -e /tmp/testnode1.standa ]; then cat /tmp/testnode1.standa | mkdef -z; rm -rf /tmp/testnode1.standa; fi end start:lsdef_template diff --git a/xCAT-test/autotest/testcase/rmdef/cases0 b/xCAT-test/autotest/testcase/rmdef/cases0 index 84c928cfc..e5bea9ce4 100644 --- a/xCAT-test/autotest/testcase/rmdef/cases0 +++ b/xCAT-test/autotest/testcase/rmdef/cases0 @@ -88,6 +88,8 @@ end start:rmdef_dynamic_group description:rmdef to remove dynamic node group label:mn_only,ci_test,db +cmd:lsdef testnode1;if [ $? -eq 0 ]; then lsdef -l testnode1 -z >/tmp/testnode1.standa ; rmdef testnode1;fi +cmd:lsdef testnode2;if [ $? -eq 0 ]; then lsdef -l testnode2 -z >/tmp/testnode2.standa ; rmdef testnode2;fi cmd:mkdef -t node -o testnode1-testnode2 mgt=hmc cons=hmc groups=all,systemp check:rc==0 cmd:mkdef -t group -o dyngrp -d -w mgt==hmc -w cons==hmc -w groups==all,systemp @@ -105,6 +107,8 @@ cmd:rmdef -t group -o dyngrp check:rc==0 cmd:lsdef -t group -o dyngrp check:output=~Could not find an object named 'dyngrp' of type 'group'. +cmd:if [ -e /tmp/testnode1.standa ]; then cat /tmp/testnode1.standa | mkdef -z; rm -rf /tmp/testnode1.standa; fi +cmd:if [ -e /tmp/testnode2.standa ]; then cat /tmp/testnode2.standa | mkdef -z; rm -rf /tmp/testnode2.standa; fi end #start:rmdef_f_all