From 8f3793cb5a058335b2f1bdcb2c3e5d8d81ff8914 Mon Sep 17 00:00:00 2001 From: luluyalula Date: Wed, 29 Jul 2020 10:38:56 +0800 Subject: [PATCH] =?UTF-8?q?update=20testcases/smoke-testing/oe=5Ftest=5Fac?= =?UTF-8?q?l=5F001/oe=5Ftest=5Facl=5F001.sh.=2062=E8=A1=8C=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=B5=8B=E7=9A=84=E6=98=AFcal03=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9/tmp/acl01=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=8F=96=E6=B6=88=E5=90=8E=EF=BC=8C=E5=AD=90=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E7=9A=84=E6=9D=83=E9=99=90=E4=B8=8D=E5=8F=97?= =?UTF-8?q?=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将两个无逻辑关系的清除语句分开执行 --- testcases/smoke-testing/oe_test_acl_001/oe_test_acl_001.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testcases/smoke-testing/oe_test_acl_001/oe_test_acl_001.sh b/testcases/smoke-testing/oe_test_acl_001/oe_test_acl_001.sh index 76dcfb3..dd5ae3f 100644 --- a/testcases/smoke-testing/oe_test_acl_001/oe_test_acl_001.sh +++ b/testcases/smoke-testing/oe_test_acl_001/oe_test_acl_001.sh @@ -59,12 +59,12 @@ function run_test() { setfacl -b /tmp/acl01 pre06=$(getfacl -p /tmp/acl01|grep "user"|awk -F : '{print $2}'|grep -w "testuser") pre07=$(getfacl -p /tmp/acl01/acl02|grep "user"|awk -F : '{print $2}'|grep -w "testuser") - pre08=$(getfacl -p /tmp/acl01/acl08|grep "user"|awk -F : '{print $2}'|grep -w "testuser") + pre08=$(getfacl -p /tmp/acl01/acl03|grep "user"|awk -F : '{print $2}'|grep -w "testuser") [ -z "$pre06" ] CHECK_RESULT $? [ -z "$pre07" ] CHECK_RESULT $? - [ -z "$pre08" ] + [ -n "$pre08" ] CHECK_RESULT $? LOG_INFO "Finish test!" @@ -72,7 +72,8 @@ function run_test() { function post_test() { LOG_INFO "start environment cleanup." - rm -rf /tmp/acl01 && userdel testuser + rm -rf /tmp/acl01 + userdel testuser LOG_INFO "Finish environment cleanup!" } -- GitLab