From 16cb85b07ffb9a1f0f6f79832ca22d571658b0e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Tue, 2 Dec 2025 01:54:18 +0800 Subject: [PATCH] fix: tests --- pkg/webserver/apache/vhost_test.go | 4 ++-- pkg/webserver/nginx/vhost.go | 3 +-- pkg/webserver/nginx/vhost_test.go | 8 ++++---- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/webserver/apache/vhost_test.go b/pkg/webserver/apache/vhost_test.go index 82f36fd3..8c7620b8 100644 --- a/pkg/webserver/apache/vhost_test.go +++ b/pkg/webserver/apache/vhost_test.go @@ -271,7 +271,7 @@ func (s *VhostTestSuite) TestBasicAuth() { s.NotNil(got) s.Equal(auth["user_file"], got["user_file"]) - err = s.vhost.SetBasicAuth(nil) + err = s.vhost.ClearBasicAuth() s.NoError(err) s.Nil(s.vhost.BasicAuth()) } @@ -288,7 +288,7 @@ func (s *VhostTestSuite) TestRateLimit() { got := s.vhost.RateLimit() s.NotNil(got) - err = s.vhost.SetRateLimit(nil) + err = s.vhost.ClearRateLimit() s.NoError(err) s.Nil(s.vhost.RateLimit()) } diff --git a/pkg/webserver/nginx/vhost.go b/pkg/webserver/nginx/vhost.go index 2319dbd3..8a055202 100644 --- a/pkg/webserver/nginx/vhost.go +++ b/pkg/webserver/nginx/vhost.go @@ -500,8 +500,7 @@ func (v *baseVhost) RateLimit() *types.RateLimit { rate = directive.GetParameters()[0].GetValue() } } - directives, err := v.parser.Find("server.limit_conn") - + directives, _ := v.parser.Find("server.limit_conn") var limitConn [][]string for _, dir := range directives { limitConn = append(limitConn, v.parser.parameters2Slices(dir.GetParameters())) diff --git a/pkg/webserver/nginx/vhost_test.go b/pkg/webserver/nginx/vhost_test.go index d0a6a157..2d1b3f3a 100644 --- a/pkg/webserver/nginx/vhost_test.go +++ b/pkg/webserver/nginx/vhost_test.go @@ -138,7 +138,7 @@ func (s *VhostTestSuite) TestListenWithHTTP3() { got := s.vhost.Listen() s.Len(got, 1) - s.Equal("http3", got[0].Args[0]) + s.Equal("quic", got[0].Args[0]) } func (s *VhostTestSuite) TestSSL() { @@ -183,7 +183,7 @@ func (s *VhostTestSuite) TestClearSSL() { } func (s *VhostTestSuite) TestPHP() { - s.Equal(0, s.vhost.PHP()) + s.Equal(uint(0), s.vhost.PHP()) s.NoError(s.vhost.SetPHP(84)) @@ -239,7 +239,7 @@ func (s *VhostTestSuite) TestBasicAuth() { s.NotNil(got) s.Equal(auth["user_file"], got["user_file"]) - s.NoError(s.vhost.SetBasicAuth(nil)) + s.NoError(s.vhost.ClearBasicAuth()) s.Nil(s.vhost.BasicAuth()) } @@ -258,7 +258,7 @@ func (s *VhostTestSuite) TestRateLimit() { s.NotNil(got) s.Equal("512k", got.Rate) - s.NoError(s.vhost.SetRateLimit(nil)) + s.NoError(s.vhost.ClearRateLimit()) s.Nil(s.vhost.RateLimit()) }