From 8753180a80e03dd031fa7f470adbcbb4a611d1c9 Mon Sep 17 00:00:00 2001 From: Maros Ondrejicka Date: Mon, 19 Dec 2022 20:35:27 +0100 Subject: hs-test: add runtime options Options "-p" to not remove topology elements after the test finishes "-v" from now on extra output from tests is hidden by default, this will show it again Type: test Signed-off-by: Maros Ondrejicka Change-Id: I626188561c883534e9004d5130ee2a972d12b4e2 --- extras/hs-test/utils.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'extras/hs-test/utils.go') diff --git a/extras/hs-test/utils.go b/extras/hs-test/utils.go index bec54e8cf50..583dc4aff54 100755 --- a/extras/hs-test/utils.go +++ b/extras/hs-test/utils.go @@ -96,7 +96,7 @@ func StartServerApp(running chan error, done chan struct{}, env []string) { cmd.Process.Kill() } -func StartClientApp(env []string, clnCh chan error) { +func StartClientApp(env []string, clnCh chan error, clnRes chan string) { defer func() { clnCh <- nil }() @@ -118,7 +118,7 @@ func StartClientApp(env []string, clnCh chan error) { nTries++ continue } else { - fmt.Printf("Client output: %s", o) + clnRes <- fmt.Sprintf("Client output: %s", o) } break } @@ -186,10 +186,9 @@ func startWget(finished chan error, server_ip, port string, netNs string) { netNs) o, err := cmd.CombinedOutput() if err != nil { - fmt.Printf("wget error: '%s'.\n%s", err, o) + finished <- errors.New(fmt.Sprintf("wget error: '%s'.\n%s", err, o)) return } - fmt.Printf("Client output: %s", o) finished <- nil } -- cgit 1.2.3-korg