From 1a9dc75fe8099fdde9b1dd248a8fca35b001f9fc Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Tue, 22 Nov 2022 12:49:22 +0100 Subject: hs-test: auto register test actions Type: improvement Signed-off-by: Filip Tehlar Change-Id: Icb5db6f69eda93181aba69b1f8676a73c0a4561b --- extras/hs-test/proxy_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'extras/hs-test/proxy_test.go') diff --git a/extras/hs-test/proxy_test.go b/extras/hs-test/proxy_test.go index 797de5255fa..d426b61a33f 100755 --- a/extras/hs-test/proxy_test.go +++ b/extras/hs-test/proxy_test.go @@ -9,7 +9,7 @@ import ( "github.com/edwarnicke/exechelper" ) -func testProxyHttpTcp(t *testing.T, dockerInstance string, proxySetup func() error) error { +func testProxyHttpTcp(t *testing.T, dockerInstance, action string, proxySetup func() error) error { const outputFile = "test.data" const srcFile = "10M" stopServer := make(chan struct{}, 1) @@ -23,7 +23,7 @@ func testProxyHttpTcp(t *testing.T, dockerInstance string, proxySetup func() err defer func() { exechelper.Run("docker stop " + dockerInstance) }() // start & configure vpp in the container - _, err = hstExec(dockerInstance, dockerInstance) + _, err = hstExec(action, dockerInstance) if err != nil { return fmt.Errorf("error starting vpp in container: %v", err) } @@ -72,7 +72,7 @@ func testProxyHttpTcp(t *testing.T, dockerInstance string, proxySetup func() err func (s *NsSuite) TestVppProxyHttpTcp() { t := s.T() dockerInstance := "vpp-proxy" - err := testProxyHttpTcp(t, dockerInstance, configureVppProxy) + err := testProxyHttpTcp(t, dockerInstance, "ConfigureVppProxy", configureVppProxy) if err != nil { t.Errorf("%v", err) } @@ -88,7 +88,7 @@ func (s *NsSuite) TestEnvoyProxyHttpTcp() { ctx, cancel := context.WithCancel(context.Background()) dockerInstance := "vpp-envoy" - err := testProxyHttpTcp(t, dockerInstance, func() error { + err := testProxyHttpTcp(t, dockerInstance, "ConfigureEnvoyProxy", func() error { return setupEnvoy(t, ctx, dockerInstance) }) if err != nil { -- cgit 1.2.3-korg