fix cli test

apache · Feb 5, 2021 · 7be3fe4 · 7be3fe4
1 parent 8227624
commit 7be3fe4
Showing 1 changed file with 24 additions and 25 deletions.
diff --git a/api/test/shell/cli_test.sh b/api/test/shell/cli_test.sh
@@ -233,6 +233,30 @@ if [[ `grep -c "/apisix/admin/user/login" ./logs/access.log` -eq '0' ]]; then
     exit 1
 fi
 
+# clean config
+clean_up
+
+# set ip allowed list
+if [[ $KERNEL = "Darwin" ]]; then
+  sed -i "" 's@127.0.0.0/24@10.0.0.1@' conf/conf.yaml
+else
+  sed -i 's@127.0.0.0/24@10.0.0.1@' conf/conf.yaml
+fi
+
+./manager-api &
+sleep 3
+
+# should be forbidden
+curl http://127.0.0.1:9000
+code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9000)
+if [ ! $code -eq 403 ]; then
+    echo "failed: verify IP allowed list failed"
+    exit 1
+fi
+
+./manager-api stop
+clean_up
+
 
 # etcd basic auth
 # add root user
@@ -290,29 +314,4 @@ fi
 
 ./manager-api stop
 
-# disable etcd auth
-curl -L http://localhost:2379/v3/auth/disable -d '{"name": "root", "password": "root"}'
-
 check_logfile
-clean_up
-
-# set ip allowed list
-if [[ $KERNEL = "Darwin" ]]; then
-  sed -i "" 's@127.0.0.0/24@10.0.0.1@' conf/conf.yaml
-else
-  sed -i 's@127.0.0.0/24@10.0.0.1@' conf/conf.yaml
-fi
-
-./manager-api &
-sleep 3
-
-# should be forbidden
-curl http://127.0.0.1:9000
-code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9000)
-if [ ! $code -eq 403 ]; then
-    echo "failed: verify IP allowed list failed"
-    exit 1
-fi
-
-./manager-api stop
-clean_up