[apisix] branch master updated: test: update apisix_cli_test.sh to fix CI (#2885)

[membphis]

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new 6f2316b  test: update apisix_cli_test.sh to fix CI (#2885)
6f2316b is described below

commit 6f2316b5b7d0cb5c71dba55b1519ac6228793412
Author: 罗泽轩 <spacewander...@gmail.com>
AuthorDate: Sat Nov 28 23:28:48 2020 +0800

    test: update apisix_cli_test.sh to fix CI (#2885)
    
    fix https://github.com/apache/apisix/issues/2888
---
 .travis/apisix_cli_test.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis/apisix_cli_test.sh b/.travis/apisix_cli_test.sh
index 27ee20f..541b220 100755
--- a/.travis/apisix_cli_test.sh
+++ b/.travis/apisix_cli_test.sh
@@ -312,7 +312,7 @@ make init
 
 set +ex
 
-grep "listen 9180 ssl" conf/nginx.conf > /dev/null
+grep "listen 9080 ssl" conf/nginx.conf > /dev/null
 if [ ! $? -eq 1 ]; then
     echo "failed: failed to rollback to the default admin config"
     exit 1
@@ -724,7 +724,7 @@ rm logs/error.log
 make init
 make run
 
-code=$(curl -v -k -i -m 20 -o /dev/null -s -w %{http_code} 
http://127.0.0.1:9180/apisix/admin/routes -H 'X-API-KEY: 
edd1c9f034335f136f87ad84b625c8f1')
+code=$(curl -v -k -i -m 20 -o /dev/null -s -w %{http_code} 
http://127.0.0.1:9080/apisix/admin/routes -H 'X-API-KEY: 
edd1c9f034335f136f87ad84b625c8f1')
 make stop
 
 if [ ! $code -eq 200 ]; then
@@ -732,7 +732,7 @@ if [ ! $code -eq 200 ]; then
     exit 1
 fi
 
-if grep 'using uninitialized "upstream_host" variable while logging request' 
logs/error.log; then
+if grep -E 'using uninitialized ".+" variable while logging request' 
logs/error.log; then
     echo "failed: uninitialized variable found during writing access log"
     exit 1
 fi
@@ -757,7 +757,7 @@ if [ ! $code -eq 200 ]; then
     exit 1
 fi
 
-if grep 'using uninitialized "upstream_host" variable while logging request' 
logs/error.log; then
+if grep -E 'using uninitialized ".+" variable while logging request' 
logs/error.log; then
     echo "failed: uninitialized variable found during writing access log"
     exit 1
 fi