aboutsummaryrefslogtreecommitdiffstats
path: root/extras/hs-test/nginx_test.go
diff options
context:
space:
mode:
authorAdrian Villin <avillin@cisco.com>2024-10-02 15:07:40 +0200
committerFlorin Coras <florin.coras@gmail.com>2024-10-03 04:56:10 +0000
commit7bae9b0e824d17de3769b2de299ad2d2c88e2620 (patch)
tree2ae63e0cefa4458ce293a0fd3d2d99542bb8a5af /extras/hs-test/nginx_test.go
parent2c52f5e8886fe2d7fa2aeb1fa15a8c9491b0128e (diff)
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 <avillin@cisco.com>
Diffstat (limited to 'extras/hs-test/nginx_test.go')
-rw-r--r--extras/hs-test/nginx_test.go19
1 files changed, 11 insertions, 8 deletions
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, "<http>", "<http> 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, "<http>", "<http> not found in the result!")
}
+
func NginxAsServerTest(s *NoTopoSuite) {
query := "return_ok"
finished := make(chan error, 1)