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

hs-test: use assert-like approach in test cases

Browse Source 
Type: test
Signed-off-by: Maros Ondrejicka <maros.ondrejicka@pantheon.tech>
Change-Id: I1653001461d4dfc52f1fb3a9e0cf458a506b8324
This commit is contained in:
Maros Ondrejicka
2022-12-06 15:38:05 +01:00
committed by Florin Coras
parent fe1fb3c31a
commit 98a91e8260
7 changed files with 83 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
extras/hs-test/vcl_test.go
View File

@ -31,25 +31,25 @@ func (s *VethsSuite) testVclEcho(proto string) {
serverVppContainer, err := s.NewContainer(srvInstance)
s.assertNil(err)
serverVppContainer.addVolume(serverVolume, "/tmp/Configure2Veths")
serverVppContainer.run()
s.assertNil(serverVppContainer.run())
clnInstance := "vpp-vcl-test-cln"
clientVppContainer, err := s.NewContainer(clnInstance)
s.assertNil(err)
clientVppContainer.addVolume(clientVolume, "/tmp/Configure2Veths")
clientVppContainer.run();
s.assertNil(clientVppContainer.run())
echoSrv := "echo-srv"
serverEchoContainer, err := s.NewContainer(echoSrv)
s.assertNil(err)
serverEchoContainer.addVolume(serverVolume, "/tmp/" + echoSrv)
serverEchoContainer.run()
s.assertNil(serverEchoContainer.run())
echoCln := "echo-cln"
clientEchoContainer, err := s.NewContainer(echoCln)
s.assertNil(err)
clientEchoContainer.addVolume(clientVolume, "/tmp/" + echoCln)
clientEchoContainer.run()
s.assertNil(clientEchoContainer.run())
_, err = hstExec("Configure2Veths srv", srvInstance)
s.assertNil(err)
@ -63,6 +63,7 @@ func (s *VethsSuite) testVclEcho(proto string) {
o, err := hstExec("RunEchoClient "+proto, echoCln)
s.assertNil(err)
fmt.Println(o)
}
@ -82,25 +83,25 @@ func (s *VethsSuite) testRetryAttach(proto string) {
serverVppContainer, err := s.NewContainer(srvInstance)
s.assertNil(err)
serverVppContainer.addVolume(serverVolume, "/tmp/Configure2Veths")
serverVppContainer.run()
s.assertNil(serverVppContainer.run())
clnInstance := "vpp-vcl-test-cln"
clientVppContainer, err := s.NewContainer(clnInstance)
s.assertNil(err)
clientVppContainer.addVolume(clientVolume, "/tmp/Configure2Veths")
clientVppContainer.run();
s.assertNil(clientVppContainer.run())
echoSrv := "echo-srv"
serverEchoContainer, err := s.NewContainer(echoSrv)
s.assertNil(err)
serverEchoContainer.addVolume(serverVolume, "/tmp/" + echoSrv)
serverEchoContainer.run()
s.assertNil(serverEchoContainer.run())
echoCln := "echo-cln"
clientEchoContainer, err := s.NewContainer(echoCln)
s.assertNil(err)
clientEchoContainer.addVolume(clientVolume, "/tmp/" + echoCln)
clientEchoContainer.run()
s.assertNil(clientEchoContainer.run())
_, err = hstExec("Configure2Veths srv-with-preset-hw-addr", srvInstance)
s.assertNil(err)