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 <maros.ondrejicka@pantheon.tech>
Change-Id: I626188561c883534e9004d5130ee2a972d12b4e2
diff --git a/extras/hs-test/proxy_test.go b/extras/hs-test/proxy_test.go
index 952bcc5..745f042 100755
--- a/extras/hs-test/proxy_test.go
+++ b/extras/hs-test/proxy_test.go
@@ -20,7 +20,7 @@
s.assertNil(err, "failed to run truncate command")
defer func() { os.Remove(srcFile) }()
- fmt.Println("Test file created...")
+ s.log("Test file created...")
go startHttpServer(serverRunning, stopServer, ":666", "server")
// TODO better error handling and recovery
@@ -30,7 +30,7 @@
stopServer <- struct{}{}
}(stopServer)
- fmt.Println("http server started...")
+ s.log("http server started...")
c := fmt.Sprintf("ip netns exec client wget --retry-connrefused --retry-on-http-error=503 --tries=10 -O %s 10.0.0.2:555/%s", outputFile, srcFile)
_, err = exechelper.CombinedOutput(c)
@@ -49,10 +49,10 @@
testVppProxy.setVppProxy()
err := testVppProxy.start()
s.assertNil(err, "failed to start and configure VPP")
- fmt.Println("VPP running and configured...")
+ s.log("VPP running and configured...")
output, err := testVppProxy.vppctl("test proxy server server-uri tcp://10.0.0.2/555 client-uri tcp://10.0.1.1/666")
- fmt.Println("Proxy configured...", string(output))
+ s.log("Proxy configured...", string(output))
return nil
}
@@ -73,7 +73,7 @@
envoyContainer := s.getContainerByName("envoy")
envoyContainer.run()
- fmt.Println("VPP running and configured...")
+ s.log("VPP running and configured...")
return nil
}