This is an automated email from the ASF dual-hosted git repository.
spacewander 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 6a7db72 ci: remove whitelist of whitespace check (#4203)
6a7db72 is described below
commit 6a7db721bb9d92f2c8570a5e995757e9c4e5111f
Author: 罗泽轩 <[email protected]>
AuthorDate: Mon May 10 11:59:51 2021 +0800
ci: remove whitelist of whitespace check (#4203)
---
.github/workflows/lint.yml | 2 +-
t/lib/test_admin.lua | 6 +++++-
t/node/remote-addr-ipv6.t | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8c637e0..50684a1 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: 🧹 Check for trailing whitespace
- run: "! git grep -EIn $'[ \t]+$' | grep -v 'received: '"
+ run: "! git grep -EIn $'[ \t]+$'"
misc:
name: misc checker
runs-on: ubuntu-latest
diff --git a/t/lib/test_admin.lua b/t/lib/test_admin.lua
index 56f9db8..88a3496 100644
--- a/t/lib/test_admin.lua
+++ b/t/lib/test_admin.lua
@@ -91,7 +91,11 @@ function _M.test_ipv6(uri)
while true do
local line, err, part = sock:receive()
if line then
- ngx.say("received: ", line)
+ if line ~= "" then
+ ngx.say("received: ", line)
+ else
+ ngx.say("received:")
+ end
else
ngx.say("failed to receive a line: ", err, " [", part, "]")
diff --git a/t/node/remote-addr-ipv6.t b/t/node/remote-addr-ipv6.t
index 9345e59..85f5c3a 100644
--- a/t/node/remote-addr-ipv6.t
+++ b/t/node/remote-addr-ipv6.t
@@ -108,7 +108,7 @@ received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
received: Server: APISIX/\d\.\d+(\.\d+)?
-received:
+received:
received: hello world
failed to receive a line: closed \[\]
close: 1 nil}
