This is an automated email from the ASF dual-hosted git repository.
nic-6443 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 f06cba56f test: relax version assertions (#13403)
f06cba56f is described below
commit f06cba56f42fb3ec549b927b10143db20ff9c4ba
Author: Nic <[email protected]>
AuthorDate: Thu May 21 15:41:09 2026 +0800
test: relax version assertions (#13403)
---
t/admin/ssl4.t | 8 ++++----
t/node/remote-addr-ipv6.t | 2 +-
t/plugin/loggly.t | 8 ++++----
t/plugin/redirect.t | 2 +-
t/plugin/server-info.t | 4 ++--
t/router/multi-ssl-certs.t | 2 +-
t/router/radixtree-sni.t | 6 +++---
t/router/radixtree-sni3.t | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/t/admin/ssl4.t b/t/admin/ssl4.t
index c9de90d9b..3e92c9a96 100644
--- a/t/admin/ssl4.t
+++ b/t/admin/ssl4.t
@@ -196,7 +196,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- error_log
@@ -222,7 +222,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- error_log
@@ -261,7 +261,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- ignore_error_log
@@ -337,7 +337,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- error_log
diff --git a/t/node/remote-addr-ipv6.t b/t/node/remote-addr-ipv6.t
index 138ef7334..e35494c11 100644
--- a/t/node/remote-addr-ipv6.t
+++ b/t/node/remote-addr-ipv6.t
@@ -101,7 +101,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received:
received: hello world
failed to receive a line: closed \[\]
diff --git a/t/plugin/loggly.t b/t/plugin/loggly.t
index babfa0adf..7c092d792 100644
--- a/t/plugin/loggly.t
+++ b/t/plugin/loggly.t
@@ -362,7 +362,7 @@ opentracing
--- grep_error_log eval
qr/message received: [ -~]+/
--- grep_error_log_out eval
-qr/message received: <10>1 [\d\-T:.]+Z [\d.]+ apisix [\d]+ - \[token-1\@41058
tag="apisix"]
\{"apisix_latency":[\d.]*,"client_ip":"127\.0\.0\.1","latency":[\d.]*,"request":\{"headers":\{"content-type":"application\/x-www-form-urlencoded","host":"127\.0\.0\.1:1984","user-agent":"lua-resty-http\/[\d.]*
\(Lua\)
ngx_lua\/[\d]*"\},"method":"GET","querystring":\{\},"size":[\d]+,"uri":"\/opentracing","url":"http:\/\/127\.0\.0\.1:1984\/opentracing"\},"response":\{"headers":\{"connection":"close"
[...]
+qr/message received: <10>1 [\d\-T:.]+Z [\d.]+ apisix [\d]+ - \[token-1\@41058
tag="apisix"]
\{"apisix_latency":[\d.]*,"client_ip":"127\.0\.0\.1","latency":[\d.]*,"request":\{"headers":\{"content-type":"application\/x-www-form-urlencoded","host":"127\.0\.0\.1:1984","user-agent":"lua-resty-http\/[\d.]*
\(Lua\)
ngx_lua\/[\d]*"\},"method":"GET","querystring":\{\},"size":[\d]+,"uri":"\/opentracing","url":"http:\/\/127\.0\.0\.1:1984\/opentracing"\},"response":\{"headers":\{"connection":"close"
[...]
@@ -410,7 +410,7 @@ opentracing
--- grep_error_log eval
qr/message received: [ -~]+/
--- grep_error_log_out eval
-qr/message received: <14>1 [\d\-T:.]+Z [\d.]+ apisix [\d]+ - \[tok\@41058
tag="apisix"]
\{"apisix_latency":[\d.]*,"client_ip":"127\.0\.0\.1","latency":[\d.]*,"request":\{"headers":\{"content-type":"application\/x-www-form-urlencoded","host":"127\.0\.0\.1:1984","user-agent":"lua-resty-http\/[\d.]*
\(Lua\)
ngx_lua\/[\d]*"\},"method":"GET","querystring":\{\},"size":[\d]+,"uri":"\/opentracing","url":"http:\/\/127\.0\.0\.1:1984\/opentracing"\},"response":\{"body":"opentracing\\n","headers":\{
[...]
+qr/message received: <14>1 [\d\-T:.]+Z [\d.]+ apisix [\d]+ - \[tok\@41058
tag="apisix"]
\{"apisix_latency":[\d.]*,"client_ip":"127\.0\.0\.1","latency":[\d.]*,"request":\{"headers":\{"content-type":"application\/x-www-form-urlencoded","host":"127\.0\.0\.1:1984","user-agent":"lua-resty-http\/[\d.]*
\(Lua\)
ngx_lua\/[\d]*"\},"method":"GET","querystring":\{\},"size":[\d]+,"uri":"\/opentracing","url":"http:\/\/127\.0\.0\.1:1984\/opentracing"\},"response":\{"body":"opentracing\\n","headers":\{
[...]
@@ -463,7 +463,7 @@ opentracing
--- grep_error_log eval
qr/message received: [ -~]+/
--- grep_error_log_out eval
-qr/message received: <14>1 [\d\-T:.]+Z [\d.]+ apisix [\d]+ - \[tok\@41058
tag="apisix"]
\{"apisix_latency":[\d.]*,"client_ip":"127\.0\.0\.1","latency":[\d.]*,"request":\{"headers":\{"content-type":"application\/x-www-form-urlencoded","host":"127\.0\.0\.1:1984","user-agent":"lua-resty-http\/[\d.]*
\(Lua\)
ngx_lua\/[\d]*"\},"method":"GET","querystring":\{"bar":"bar"\},"size":[\d]+,"uri":"\/opentracing\?bar=bar","url":"http:\/\/127\.0\.0\.1:1984\/opentracing\?bar=bar"\},"response":\{"body":
[...]
+qr/message received: <14>1 [\d\-T:.]+Z [\d.]+ apisix [\d]+ - \[tok\@41058
tag="apisix"]
\{"apisix_latency":[\d.]*,"client_ip":"127\.0\.0\.1","latency":[\d.]*,"request":\{"headers":\{"content-type":"application\/x-www-form-urlencoded","host":"127\.0\.0\.1:1984","user-agent":"lua-resty-http\/[\d.]*
\(Lua\)
ngx_lua\/[\d]*"\},"method":"GET","querystring":\{"bar":"bar"\},"size":[\d]+,"uri":"\/opentracing\?bar=bar","url":"http:\/\/127\.0\.0\.1:1984\/opentracing\?bar=bar"\},"response":\{"body":
[...]
@@ -487,7 +487,7 @@ opentracing
--- grep_error_log eval
qr/message received: [ -~]+/
--- grep_error_log_out eval
-qr/message received: <14>1 [\d\-T:.]+Z [\d.]+ apisix [\d]+ - \[tok\@41058
tag="apisix"]
\{"apisix_latency":[\d.]*,"client_ip":"127\.0\.0\.1","latency":[\d.]*,"request":\{"headers":\{"content-type":"application\/x-www-form-urlencoded","host":"127\.0\.0\.1:1984","user-agent":"lua-resty-http\/[\d.]*
\(Lua\)
ngx_lua\/[\d]*"\},"method":"GET","querystring":\{"foo":"bar"\},"size":[\d]+,"uri":"\/opentracing\?foo=bar","url":"http:\/\/127\.0\.0\.1:1984\/opentracing\?foo=bar"\},"response":\{"header
[...]
+qr/message received: <14>1 [\d\-T:.]+Z [\d.]+ apisix [\d]+ - \[tok\@41058
tag="apisix"]
\{"apisix_latency":[\d.]*,"client_ip":"127\.0\.0\.1","latency":[\d.]*,"request":\{"headers":\{"content-type":"application\/x-www-form-urlencoded","host":"127\.0\.0\.1:1984","user-agent":"lua-resty-http\/[\d.]*
\(Lua\)
ngx_lua\/[\d]*"\},"method":"GET","querystring":\{"foo":"bar"\},"size":[\d]+,"uri":"\/opentracing\?foo=bar","url":"http:\/\/127\.0\.0\.1:1984\/opentracing\?foo=bar"\},"response":\{"header
[...]
diff --git a/t/plugin/redirect.t b/t/plugin/redirect.t
index 87847bfa4..9fa29240a 100644
--- a/t/plugin/redirect.t
+++ b/t/plugin/redirect.t
@@ -695,7 +695,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- no_error_log
diff --git a/t/plugin/server-info.t b/t/plugin/server-info.t
index 13c44a92f..e25f3f73d 100644
--- a/t/plugin/server-info.t
+++ b/t/plugin/server-info.t
@@ -76,7 +76,7 @@ location /t {
}
}
--- response_body eval
-qr/^{"boot_time":\d+,"etcd_version":"[\d\.]+","hostname":"[a-zA-Z\-0-9\.]+","id":[a-zA-Z\-0-9]+,"version":"[\d\.]+"}$/
+qr/^{"boot_time":\d+,"etcd_version":"[\d\.]+","hostname":"[a-zA-Z\-0-9\.]+","id":[a-zA-Z\-0-9]+,"version":"[0-9A-Za-z._+-]+"}$/
@@ -101,4 +101,4 @@ location /t {
}
}
--- response_body eval
-qr/^{"boot_time":\d+,"etcd_version":"[\d\.]+","hostname":"[a-zA-Z\-0-9\.]+","id":[a-zA-Z\-0-9]+,"version":"[\d\.]+"}$/
+qr/^{"boot_time":\d+,"etcd_version":"[\d\.]+","hostname":"[a-zA-Z\-0-9\.]+","id":[a-zA-Z\-0-9]+,"version":"[0-9A-Za-z._+-]+"}$/
diff --git a/t/router/multi-ssl-certs.t b/t/router/multi-ssl-certs.t
index 4ae7ec215..4300f68d3 100644
--- a/t/router/multi-ssl-certs.t
+++ b/t/router/multi-ssl-certs.t
@@ -154,7 +154,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- error_log
diff --git a/t/router/radixtree-sni.t b/t/router/radixtree-sni.t
index 781bf28d9..840c1a1b6 100644
--- a/t/router/radixtree-sni.t
+++ b/t/router/radixtree-sni.t
@@ -157,7 +157,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- error_log
@@ -300,7 +300,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- error_log
@@ -405,7 +405,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- error_log
diff --git a/t/router/radixtree-sni3.t b/t/router/radixtree-sni3.t
index 88210c9ec..373f5f3ff 100644
--- a/t/router/radixtree-sni3.t
+++ b/t/router/radixtree-sni3.t
@@ -278,7 +278,7 @@ received: HTTP/1.1 200 OK
received: Content-Type: text/plain
received: Content-Length: 12
received: Connection: close
-received: Server: APISIX/\d\.\d+(\.\d+)?
+received: Server: APISIX/[0-9A-Za-z._+-]+
received: \nreceived: hello world
close: 1 nil}
--- error_log
