hs-test: remove assert in container.Exec

- removed so we can ignore errors (e.g. vppinstance.Stop)

Type: test

Change-Id: Ib83057eaac7ae6e7338ae9cb59ab2af6239c47a5
Signed-off-by: Adrian Villin <avillin@cisco.com>

5 files changed, 22 insertions, 13 deletions

diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go
index 760ca3ca936..93317bbf8d8 100644
--- a/extras/hs-test/http_test.go
+++ b/extras/hs-test/http_test.go
@@ -412,7 +412,8 @@ func httpClientGet(s *NoTopoSuite, response string, size int) {
 	s.AssertContains(o, response)
 	s.AssertContains(o, "Content-Length: "+strconv.Itoa(size))
 
-	file_contents := vpp.Container.Exec(false, "cat /tmp/response.txt")
+	file_contents, err := vpp.Container.Exec(false, "cat /tmp/response.txt")
+	s.AssertNil(err)
 	s.AssertContains(file_contents, response)
 }
 
@@ -463,7 +464,8 @@ func httpClientRepeat(s *NoTopoSuite, requestMethod string, clientArgs string) {
 	o := vpp.Vppctl(cmd)
 	s.Log(o)
 
-	replyCount := s.Containers.NginxServer.Exec(false, "awk 'END { print NR }' "+logPath)
+	replyCount, err := s.Containers.NginxServer.Exec(false, "awk 'END { print NR }' "+logPath)
+	s.AssertNil(err)
 	if replyCount != "" {
 		replyCountInt, err = strconv.Atoi(replyCount[:len(replyCount)-1])
 		s.AssertNil(err)
@@ -485,7 +487,8 @@ func httpClientRepeat(s *NoTopoSuite, requestMethod string, clientArgs string) {
 	o = vpp.Vppctl(cmd)
 	s.Log(o)
 
-	replyCount = s.Containers.NginxServer.Exec(false, "awk 'END { print NR }' "+logPath)
+	replyCount, err = s.Containers.NginxServer.Exec(false, "awk 'END { print NR }' "+logPath)
+	s.AssertNil(err)
 	if replyCount != "" {
 		replyCountInt, err = strconv.Atoi(replyCount[:len(replyCount)-1])
 		s.AssertNil(err)
diff --git a/extras/hs-test/infra/container.go b/extras/hs-test/infra/container.go
index 918c19e669e..efc317fa96d 100644
--- a/extras/hs-test/infra/container.go
+++ b/extras/hs-test/infra/container.go
@@ -460,7 +460,7 @@ func (c *Container) ExecServer(useEnvVars bool, command string, arguments ...any
 	c.Suite.AssertNil(exechelper.Run(containerExecCommand))
 }
 
-func (c *Container) Exec(useEnvVars bool, command string, arguments ...any) string {
+func (c *Container) Exec(useEnvVars bool, command string, arguments ...any) (string, error) {
 	var envVars string
 	serverCommand := fmt.Sprintf(command, arguments...)
 	if useEnvVars {
@@ -472,8 +472,7 @@ func (c *Container) Exec(useEnvVars bool, command string, arguments ...any) stri
 	GinkgoHelper()
 	c.Suite.Log(containerExecCommand)
 	byteOutput, err := exechelper.CombinedOutput(containerExecCommand)
-	c.Suite.AssertNil(err, fmt.Sprint(err))
-	return string(byteOutput)
+	return string(byteOutput), err
 }
 
 func (c *Container) saveLogs() {
diff --git a/extras/hs-test/infra/vppinstance.go b/extras/hs-test/infra/vppinstance.go
index 370d2be38d1..59d17de4d20 100644
--- a/extras/hs-test/infra/vppinstance.go
+++ b/extras/hs-test/infra/vppinstance.go
@@ -243,9 +243,11 @@ func (vpp *VppInstance) Start() error {
 }
 
 func (vpp *VppInstance) Stop() {
-	pid := strings.TrimSpace(vpp.Container.Exec(false, "pidof vpp"))
+	pid, err := vpp.Container.Exec(false, "pidof vpp")
+	pid = strings.TrimSpace(pid)
 	// Stop VPP only if it's still running
-	if len(pid) > 0 {
+	if err == nil {
+		vpp.getSuite().Log("Stopping VPP")
 		vpp.Container.Exec(false, "bash -c \"kill -15 "+pid+"\"")
 	}
 }
diff --git a/extras/hs-test/raw_session_test.go b/extras/hs-test/raw_session_test.go
index c104031f78f..b93b27ab56b 100644
--- a/extras/hs-test/raw_session_test.go
+++ b/extras/hs-test/raw_session_test.go
@@ -35,6 +35,7 @@ func testVppEcho(s *VethsSuite, proto string) {
 		" socket-name " + s.Containers.ClientApp.GetContainerWorkDir() + "/var/run/app_ns_sockets/default" +
 		" use-app-socket-api uri " + uri
 	s.Log(clientCommand)
-	o := s.Containers.ClientApp.Exec(true, clientCommand)
+	o, err := s.Containers.ClientApp.Exec(true, clientCommand)
+	s.AssertNil(err)
 	s.Log(o)
 }
diff --git a/extras/hs-test/vcl_test.go b/extras/hs-test/vcl_test.go
index 11e2be1258e..e88b6b7da38 100644
--- a/extras/hs-test/vcl_test.go
+++ b/extras/hs-test/vcl_test.go
@@ -50,7 +50,8 @@ func testXEchoVclClient(s *VethsSuite, proto string) {
 	testClientCommand := "vcl_test_client -N 100 -p " + proto + " " + s.Interfaces.Server.Ip4AddressString() + " " + port
 	s.Log(testClientCommand)
 	echoClnContainer.AddEnvVar("VCL_CONFIG", "/vcl.conf")
-	o := echoClnContainer.Exec(true, testClientCommand)
+	o, err := echoClnContainer.Exec(true, testClientCommand)
+	s.AssertNil(err)
 	s.Log(o)
 	s.AssertContains(o, "CLIENT RESULTS")
 }
@@ -97,7 +98,8 @@ func testVclEcho(s *VethsSuite, proto string) {
 
 	testClientCommand := "vcl_test_client -p " + proto + " " + serverVethAddress + " " + port
 	echoClnContainer.AddEnvVar("VCL_CONFIG", "/vcl.conf")
-	o := echoClnContainer.Exec(true, testClientCommand)
+	o, err := echoClnContainer.Exec(true, testClientCommand)
+	s.AssertNil(err)
 	s.Log(o)
 }
 
@@ -137,7 +139,8 @@ func testRetryAttach(s *VethsSuite, proto string) {
 
 	testClientCommand := "vcl_test_client -U -p " + proto + " " + serverVethAddress + " 12346"
 	echoClnContainer.AddEnvVar("VCL_CONFIG", "/vcl.conf")
-	o := echoClnContainer.Exec(true, testClientCommand)
+	o, err := echoClnContainer.Exec(true, testClientCommand)
+	s.AssertNil(err)
 	s.Log(o)
 	s.Log("... First test ended. Stopping VPP server now.")
 
@@ -152,7 +155,8 @@ func testRetryAttach(s *VethsSuite, proto string) {
 	time.Sleep(30 * time.Second) // Wait a moment for the re-attachment to happen
 
 	s.Log("... Running second echo client test, after disconnect and re-attachment.")
-	o = echoClnContainer.Exec(true, testClientCommand)
+	o, err = echoClnContainer.Exec(true, testClientCommand)
+	s.AssertNil(err)
 	s.Log(o)
 	s.Log("Done.")
 }