hs-test: separate infra from tests
- most functions and vars now start with a capital letter:
needed to access them outside the package that declares
them
- updated README.md
- very minor changes in MAKEFILE
Type: test
Change-Id: I4b5a194f08f09d59e372e57da6451fbb5a1de4da
Signed-off-by: Adrian Villin <avillin@cisco.com>
diff --git a/extras/hs-test/linux_iperf_test.go b/extras/hs-test/linux_iperf_test.go
index e323f7f..f49d9bc 100644
--- a/extras/hs-test/linux_iperf_test.go
+++ b/extras/hs-test/linux_iperf_test.go
@@ -1,13 +1,13 @@
package main
import (
+ . "fd.io/hs-test/infra"
"fmt"
-
. "github.com/onsi/ginkgo/v2"
)
func init() {
- registerTapTests(LinuxIperfTest)
+ RegisterTapTests(LinuxIperfTest)
}
func LinuxIperfTest(s *TapSuite) {
@@ -21,20 +21,20 @@
go func() {
defer GinkgoRecover()
- s.startServerApp(srvCh, stopServerCh, nil)
+ s.StartServerApp(srvCh, stopServerCh, nil)
}()
err := <-srvCh
- s.assertNil(err, fmt.Sprint(err))
- s.log("server running")
+ s.AssertNil(err, fmt.Sprint(err))
+ s.Log("server running")
- ipAddress := s.getInterfaceByName(tapInterfaceName).ip4AddressString()
+ ipAddress := s.GetInterfaceByName(TapInterfaceName).Ip4AddressString()
go func() {
defer GinkgoRecover()
- s.startClientApp(ipAddress, nil, clnCh, clnRes)
+ s.StartClientApp(ipAddress, nil, clnCh, clnRes)
}()
- s.log("client running")
- s.log(<-clnRes)
+ s.Log("client running")
+ s.Log(<-clnRes)
err = <-clnCh
- s.assertNil(err, "err: '%s', ip: '%s'", err, ipAddress)
- s.log("Test completed")
+ s.AssertNil(err, "err: '%s', ip: '%s'", err, ipAddress)
+ s.Log("Test completed")
}