hs-test: small improvements

Type: test

Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Change-Id: Ifa56da632b139acd5e743c3076c24b5b55388924

2 files changed, 12 insertions, 23 deletions

diff --git a/extras/hs-test/framework_test.go b/extras/hs-test/framework_test.go
index 33bc1f35011..cd43cfe4612 100755
--- a/extras/hs-test/framework_test.go
+++ b/extras/hs-test/framework_test.go
@@ -1,9 +1,9 @@
 package main
 
 import (
-	"testing"
 	"io/ioutil"
 	"os"
+	"testing"
 
 	"github.com/edwarnicke/exechelper"
 	"github.com/stretchr/testify/assert"
@@ -12,17 +12,11 @@ import (
 )
 
 func IsPersistent() bool {
-	if os.Getenv("HST_PERSIST") == "1" {
-		return true
-	}
-	return false
+	return os.Getenv("HST_PERSIST") == "1"
 }
 
 func IsVerbose() bool {
-	if os.Getenv("HST_VERBOSE") == "1" {
-		return true
-	}
-	return false
+	return os.Getenv("HST_VERBOSE") == "1"
 }
 
 type HstSuite struct {
diff --git a/extras/hs-test/proxy_test.go b/extras/hs-test/proxy_test.go
index 745f042a4b6..70fb526e14f 100755
--- a/extras/hs-test/proxy_test.go
+++ b/extras/hs-test/proxy_test.go
@@ -7,14 +7,12 @@ 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")
@@ -53,13 +51,13 @@ func configureVppProxy(s *NsSuite) error {
 
 	output, err := testVppProxy.vppctl("test proxy server server-uri tcp://10.0.0.2/555 client-uri tcp://10.0.1.1/666")
 	s.log("Proxy configured...", string(output))
-	return nil
+	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()
-
-	s.log("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)
 }