X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fhs-test%2Fproxy_test.go;h=70fb526e14f7421f19db01241b96fd0f8e0cd731;hb=bb98aac4223f506ec18109f9836daa6ef0d61180;hp=952bcc5aa76f688ee85a190d7b1e9d52a08fc2a4;hpb=db823ed6e9543741f6969ff160314093002e037e;p=vpp.git

diff --git a/extras/hs-test/proxy_test.go b/extras/hs-test/proxy_test.go
index 952bcc5aa76..70fb526e14f 100755
--- a/extras/hs-test/proxy_test.go
+++ b/extras/hs-test/proxy_test.go
@@ -7,20 +7,18 @@ import (
 	"github.com/edwarnicke/exechelper"
 )
 
-func testProxyHttpTcp(s *NsSuite, proxySetup func() error) error {
+func testProxyHttpTcp(s *NsSuite) error {
 	const outputFile = "test.data"
 	const srcFile = "10M"
 	stopServer := make(chan struct{}, 1)
 	serverRunning := make(chan struct{}, 1)
 
-	s.assertNil(proxySetup(), "failed to setup proxy")
-
 	// create test file
 	err := exechelper.Run(fmt.Sprintf("ip netns exec server truncate -s %s %s", srcFile, srcFile))
 	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 +28,7 @@ func testProxyHttpTcp(s *NsSuite, proxySetup func() error) error {
 		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,17 +47,17 @@ func configureVppProxy(s *NsSuite) error {
 	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))
-	return nil
+	s.log("Proxy configured...", string(output))
+	return err
 }
 
 func (s *NsSuite) TestVppProxyHttpTcp() {
-	err := testProxyHttpTcp(s, func() error {
-		return configureVppProxy(s)
-	})
+	err := configureVppProxy(s)
+	s.assertNil(err)
+	err = testProxyHttpTcp(s)
 	s.assertNil(err)
 }
 
@@ -71,15 +69,12 @@ func configureEnvoyProxy(s *NsSuite) error {
 	s.assertNil(err, "failed to start and configure VPP")
 
 	envoyContainer := s.getContainerByName("envoy")
-	envoyContainer.run()
-
-	fmt.Println("VPP running and configured...")
-	return nil
+	return envoyContainer.run()
 }
 
 func (s *NsSuite) TestEnvoyProxyHttpTcp() {
-	err := testProxyHttpTcp(s, func() error {
-		return configureEnvoyProxy(s)
-	})
+	err := configureEnvoyProxy(s)
+	s.assertNil(err)
+	err = testProxyHttpTcp(s)
 	s.assertNil(err)
 }