hs-test: add nginx test

[vpp.git] / extras / hs-test / utils.go

diff --git a/extras/hs-test/utils.go b/extras/hs-test/utils.go
index bec54e8..e23ea81 100755 (executable)
--- 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
        }
@@ -176,20 +176,18 @@ func startHttpServer(running chan struct{}, done chan struct{}, addressPort, net
        cmd.Process.Kill()
 }
 
-func startWget(finished chan error, server_ip, port string, netNs string) {
-       fname := "test_file_10M"
+func startWget(finished chan error, server_ip, port, query, netNs string) {
        defer func() {
                finished <- errors.New("wget error")
        }()
 
-       cmd := NewCommand([]string{"wget", "--tries=5", "-q", "-O", "/dev/null", server_ip + ":" + port + "/" + fname},
+       cmd := NewCommand([]string{"wget", "--tries=5", "-q", "-O", "/dev/null", server_ip + ":" + port + "/" + query},
                netNs)
        o, err := cmd.CombinedOutput()
        if err != nil {
-               fmt.Printf("wget error: '%s'.\n%s", err, o)
+               finished <- fmt.Errorf("wget error: '%v\n\n%s'", err, o)
                return
        }
-       fmt.Printf("Client output: %s", o)
        finished <- nil
 }