From 7bae9b0e824d17de3769b2de299ad2d2c88e2620 Mon Sep 17 00:00:00 2001 From: Adrian Villin Date: Wed, 2 Oct 2024 15:07:40 +0200 Subject: hs-test: use nginx 1.26.2 for NginxHttp3Test - test is no longer marked as extended - no building required -> removed nginx build scripts Type: test Change-Id: I1814b1e4b7e514f81797efa3b5c1e818d2fe4cda Signed-off-by: Adrian Villin --- extras/hs-test/nginx_test.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'extras/hs-test/nginx_test.go') diff --git a/extras/hs-test/nginx_test.go b/extras/hs-test/nginx_test.go index 8bf681d18c6..07faf2a3262 100644 --- a/extras/hs-test/nginx_test.go +++ b/extras/hs-test/nginx_test.go @@ -15,11 +15,11 @@ func init() { } func NginxHttp3Test(s *NoTopoSuite) { - s.SkipUnlessExtendedTestsBuilt() - query := "index.html" - nginxCont := s.GetContainerByName("nginx-http3") - nginxCont.Run() + nginxCont := s.GetContainerByName(NginxHttp3ContainerName) + nginxCont.Create() + s.CreateNginxConfig(nginxCont) + nginxCont.Start() vpp := s.GetContainerByName("vpp").VppInstance vpp.WaitForApp("nginx-", 5) @@ -30,11 +30,14 @@ func NginxHttp3Test(s *NoTopoSuite) { args := fmt.Sprintf("curl --noproxy '*' --local-port 55444 --http3-only -k https://%s:8443/%s", serverAddress, query) curlCont.ExtraRunningArgs = args curlCont.Run() - o, err := curlCont.GetOutput() - s.Log(o) - s.AssertEmpty(err) - s.AssertContains(o, "", " not found in the result!") + body, stats := curlCont.GetOutput() + s.Log(body) + s.Log(stats) + s.AssertNotContains(stats, "refused") + s.AssertContains(stats, "100") + s.AssertContains(body, "", " not found in the result!") } + func NginxAsServerTest(s *NoTopoSuite) { query := "return_ok" finished := make(chan error, 1) -- cgit 1.2.3-korg