ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hs-test: small improvements

Browse Source 
Type: test

Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Change-Id: Ifa56da632b139acd5e743c3076c24b5b55388924
This commit is contained in:
Filip Tehlar
2022-12-21 14:40:35 +01:00
committed by Florin Coras
parent 24adebad27
commit bb98aac422
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
extras/hs-test/proxy_test.go
View File

@@ -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)
}