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

hs-test: fix envoy test

Browse Source 
Type: test

Signed-off-by: Filip Tehlar <ftehlar@cisco.com>
Change-Id: I776e0f1f7ea700439d1fe6a598772776ae6a1493
This commit is contained in:
Filip Tehlar
2023-03-07 10:13:19 +01:00
committed by Florin Coras
parent 21121f60d2
commit 9abba11a94
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extras/hs-test/container.go
View File

@ -127,17 +127,20 @@ func (c *Container) getContainerArguments() string {
args += c.getVolumesAsCliOption() args += c.getVolumesAsCliOption()
args += c.getEnvVarsAsCliOption() args += c.getEnvVarsAsCliOption()
args += " --name " + c.name + " " + c.image args += " --name " + c.name + " " + c.image
args += " " + c.extraRunningArgs
return args return args
} }
func (c *Container) create() { func (c *Container) create() error {
cmd := "docker create " + c.getContainerArguments() cmd := "docker create " + c.getContainerArguments()
exechelper.Run(cmd) c.Suite().log(cmd)
return exechelper.Run(cmd)
} }
func (c *Container) start() { func (c *Container) start() error {
cmd := "docker start " + c.name cmd := "docker start " + c.name
exechelper.Run(cmd) c.Suite().log(cmd)
return exechelper.Run(cmd)
} }
func (c *Container) run() error { func (c *Container) run() error {
@ -145,7 +148,7 @@ func (c *Container) run() error {
return fmt.Errorf("run container failed: name is blank") return fmt.Errorf("run container failed: name is blank")
} }
cmd := "docker run -d " + c.getContainerArguments() + " " + c.extraRunningArgs cmd := "docker run -d " + c.getContainerArguments()
c.Suite().log(cmd) c.Suite().log(cmd)
err := exechelper.Run(cmd) err := exechelper.Run(cmd)
if err != nil { if err != nil {

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

@ -83,8 +83,7 @@ func configureEnvoyProxy(s *NsSuite) {
"resources/envoy/proxy.yaml", "resources/envoy/proxy.yaml",
address, address,
) )
s.assertNil(envoyContainer.start())
envoyContainer.start()
} }
func (s *NsSuite) TestEnvoyProxyHttpTcp() { func (s *NsSuite) TestEnvoyProxyHttpTcp() {

6
extras/hs-test/vppinstance.go
View File

@ -2,7 +2,6 @@ package main
import ( import (
"fmt" "fmt"
"github.com/edwarnicke/exechelper"
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
@ -10,6 +9,8 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/edwarnicke/exechelper"
"go.fd.io/govpp" "go.fd.io/govpp"
"go.fd.io/govpp/api" "go.fd.io/govpp/api"
"go.fd.io/govpp/binapi/af_packet" "go.fd.io/govpp/binapi/af_packet"
@ -121,8 +122,7 @@ func (vpp *VppInstance) start() error {
signal.Notify(sig, syscall.SIGINT) signal.Notify(sig, syscall.SIGINT)
cont := make(chan bool, 1) cont := make(chan bool, 1)
go func() { go func() {
sig := <-sig <-sig
fmt.Println(sig)
cont <- true cont <- true
}() }()