hs-test: log external apps

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

diff --git a/extras/hs-test/linux_iperf_test.go b/extras/hs-test/linux_iperf_test.go
old mode 100755 (executable)
new mode 100644 (file)
index bef07fb..c03403c
--- a/extras/hs-test/linux_iperf_test.go
+++ b/extras/hs-test/linux_iperf_test.go
@@ -1,21 +1,24 @@
 package main
 
 func (s *TapSuite) TestLinuxIperf() {
-       t := s.T()
        clnCh := make(chan error)
        stopServerCh := make(chan struct{})
        srvCh := make(chan error, 1)
+       clnRes := make(chan string, 1)
        defer func() {
                stopServerCh <- struct{}{}
        }()
 
-       go StartServerApp(srvCh, stopServerCh, nil)
+       go s.startServerApp(srvCh, stopServerCh, nil)
        err := <-srvCh
        s.assertNil(err)
-       t.Log("server running")
-       go StartClientApp(nil, clnCh)
-       t.Log("client running")
+       s.log("server running")
+
+       ipAddress := s.netInterfaces[tapInterfaceName].ip4AddressString()
+       go s.startClientApp(ipAddress, nil, clnCh, clnRes)
+       s.log("client running")
+       s.log(<-clnRes)
        err = <-clnCh
        s.assertNil(err)
-       t.Log("Test completed")
+       s.log("Test completed")
 }