hs-test: log external apps

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

diff --git a/extras/hs-test/proxy_test.go b/extras/hs-test/proxy_test.go
index ce0e7ad..9e72303 100644 (file)
--- a/extras/hs-test/proxy_test.go
+++ b/extras/hs-test/proxy_test.go
@@ -20,7 +20,7 @@ func testProxyHttpTcp(s *NsSuite) error {
 
        s.log("test file created...")
 
-       go startHttpServer(serverRunning, stopServer, ":666", "server")
+       go s.startHttpServer(serverRunning, stopServer, ":666", "server")
        // TODO better error handling and recovery
        <-serverRunning
 
@@ -35,7 +35,7 @@ func testProxyHttpTcp(s *NsSuite) error {
                " --retry-on-http-error=503 --tries=10"+
                " -O %s %s:555/%s",
                outputFile,
-               clientVeth.IP4AddressString(),
+               clientVeth.ip4AddressString(),
                srcFile,
        )
        s.log(c)
@@ -56,8 +56,8 @@ func configureVppProxy(s *NsSuite) {
        testVppProxy := s.getContainerByName("vpp").vppInstance
        output := testVppProxy.vppctl(
                "test proxy server server-uri tcp://%s/555 client-uri tcp://%s/666",
-               clientVeth.IP4AddressString(),
-               serverVeth.Peer().IP4AddressString(),
+               clientVeth.ip4AddressString(),
+               serverVeth.peer.ip4AddressString(),
        )
        s.log("proxy configured...", output)
 }
@@ -76,15 +76,14 @@ func configureEnvoyProxy(s *NsSuite) {
        address := struct {
                Server string
        }{
-               Server: serverVeth.Peer().IP4AddressString(),
+               Server: serverVeth.peer.ip4AddressString(),
        }
        envoyContainer.createConfig(
                "/etc/envoy/envoy.yaml",
                "resources/envoy/proxy.yaml",
                address,
        )
-
-       envoyContainer.start()
+       s.assertNil(envoyContainer.start())
 }
 
 func (s *NsSuite) TestEnvoyProxyHttpTcp() {