From 1fde999eec2e0f6f8997c1bf41b638f085a14b07 Mon Sep 17 00:00:00 2001 From: Adrian Villin Date: Mon, 24 Jun 2024 08:14:05 -0400 Subject: hs-test: added interrupt mode tests Type: test Change-Id: I327fa1a4ea23a3af3aa33e5260367426a11e7b4f Signed-off-by: Adrian Villin --- extras/hs-test/http_test.go | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'extras/hs-test/http_test.go') diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go index d83f2d10ffb..68e2e656b35 100644 --- a/extras/hs-test/http_test.go +++ b/extras/hs-test/http_test.go @@ -17,7 +17,8 @@ import ( func init() { RegisterVethTests(HttpCliTest, HttpCliConnectErrorTest) RegisterNoTopoTests(NginxHttp3Test, NginxAsServerTest, - NginxPerfCpsTest, NginxPerfRpsTest, NginxPerfWrkTest, HeaderServerTest, + NginxPerfCpsTest, NginxPerfRpsTest, NginxPerfWrkTest, NginxPerfCpsInterruptModeTest, + NginxPerfRpsInterruptModeTest, NginxPerfWrkInterruptModeTest, HeaderServerTest, HttpStaticMovedTest, HttpStaticNotFoundTest, HttpCliMethodNotAllowedTest, HttpCliBadRequestTest, HttpStaticBuildInUrlGetIfStatsTest, HttpStaticBuildInUrlPostIfStatsTest, HttpInvalidRequestLineTest, HttpMethodNotImplementedTest, HttpInvalidHeadersTest, @@ -25,7 +26,7 @@ func init() { HttpStaticMacTimeTest, HttpStaticBuildInUrlGetVersionVerboseTest, HttpVersionNotSupportedTest, HttpInvalidContentLengthTest, HttpInvalidTargetSyntaxTest, HttpStaticPathTraversalTest, HttpUriDecodeTest, HttpHeadersTest) - RegisterNoTopoSoloTests(HttpStaticPromTest, HttpTpsTest) + RegisterNoTopoSoloTests(HttpStaticPromTest, HttpTpsTest, HttpTpsInterruptModeTest) } const wwwRootPath = "/tmp/www_root" @@ -46,6 +47,10 @@ func httpDownloadBenchmark(s *HstSuite, experiment *gmeasure.Experiment, data in experiment.RecordValue("Download Speed", (float64(resp.ContentLength)/1024/1024)/duration.Seconds(), gmeasure.Units("MB/s"), gmeasure.Precision(2)) } +func HttpTpsInterruptModeTest(s *NoTopoSuite) { + HttpTpsTest(s) +} + func HttpTpsTest(s *NoTopoSuite) { vpp := s.GetContainerByName("vpp").VppInstance serverAddress := s.GetInterfaceByName(TapInterfaceName).Peer.Ip4AddressString() @@ -635,16 +640,28 @@ func runNginxPerf(s *NoTopoSuite, mode, ab_or_wrk string) error { return nil } +func NginxPerfCpsInterruptModeTest(s *NoTopoSuite) { + NginxPerfCpsTest(s) +} + // unstable with multiple workers func NginxPerfCpsTest(s *NoTopoSuite) { s.SkipIfMultiWorker() s.AssertNil(runNginxPerf(s, "cps", "ab")) } +func NginxPerfRpsInterruptModeTest(s *NoTopoSuite) { + NginxPerfRpsTest(s) +} + func NginxPerfRpsTest(s *NoTopoSuite) { s.AssertNil(runNginxPerf(s, "rps", "ab")) } +func NginxPerfWrkInterruptModeTest(s *NoTopoSuite) { + NginxPerfWrkTest(s) +} + func NginxPerfWrkTest(s *NoTopoSuite) { s.AssertNil(runNginxPerf(s, "", "wrk")) } -- cgit 1.2.3-korg