mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-16 15:07:46 +00:00
virtcontainers: Reduce hyperstart mock test noise
We don't need that many logs, especially for the positive path. Fixes: #1211 Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
parent
5f1ca16402
commit
79ed0886c6
@ -42,27 +42,6 @@ const (
|
|||||||
SetupRoute = "setuproute"
|
SetupRoute = "setuproute"
|
||||||
)
|
)
|
||||||
|
|
||||||
var codeList = map[int]string{
|
|
||||||
hyper.VersionCode: Version,
|
|
||||||
hyper.StartSandboxCode: StartSandbox,
|
|
||||||
hyper.DestroySandboxCode: DestroySandbox,
|
|
||||||
hyper.ExecCmdCode: ExecCmd,
|
|
||||||
hyper.ReadyCode: Ready,
|
|
||||||
hyper.AckCode: Ack,
|
|
||||||
hyper.ErrorCode: Error,
|
|
||||||
hyper.WinsizeCode: WinSize,
|
|
||||||
hyper.PingCode: Ping,
|
|
||||||
hyper.NextCode: Next,
|
|
||||||
hyper.WriteFileCode: WriteFile,
|
|
||||||
hyper.ReadFileCode: ReadFile,
|
|
||||||
hyper.NewContainerCode: NewContainer,
|
|
||||||
hyper.KillContainerCode: KillContainer,
|
|
||||||
hyper.OnlineCPUMemCode: OnlineCPUMem,
|
|
||||||
hyper.SetupInterfaceCode: SetupInterface,
|
|
||||||
hyper.SetupRouteCode: SetupRoute,
|
|
||||||
hyper.RemoveContainerCode: RemoveContainer,
|
|
||||||
}
|
|
||||||
|
|
||||||
// Hyperstart is an object mocking the hyperstart agent.
|
// Hyperstart is an object mocking the hyperstart agent.
|
||||||
type Hyperstart struct {
|
type Hyperstart struct {
|
||||||
t *testing.T
|
t *testing.T
|
||||||
@ -119,10 +98,6 @@ func (h *Hyperstart) GetLastMessages() []hyper.DecodedMessage {
|
|||||||
return msgs
|
return msgs
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Hyperstart) log(s string) {
|
|
||||||
h.logf("%s\n", s)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Hyperstart) logf(format string, args ...interface{}) {
|
func (h *Hyperstart) logf(format string, args ...interface{}) {
|
||||||
h.t.Logf("[hyperstart] "+format, args...)
|
h.t.Logf("[hyperstart] "+format, args...)
|
||||||
}
|
}
|
||||||
@ -214,24 +189,13 @@ func (h *Hyperstart) readMessage() (int, []byte, error) {
|
|||||||
return cmd, data, nil
|
return cmd, data, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func cmdToString(cmd int) (string, error) {
|
|
||||||
_, ok := codeList[cmd]
|
|
||||||
if ok == false {
|
|
||||||
return "", fmt.Errorf("unknown command '%d'", cmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
return codeList[cmd], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *Hyperstart) handleCtl() {
|
func (h *Hyperstart) handleCtl() {
|
||||||
for {
|
for {
|
||||||
cmd, data, err := h.readMessage()
|
cmd, data, err := h.readMessage()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
cmdName, err := cmdToString(cmd)
|
|
||||||
assert.Nil(h.t, err)
|
|
||||||
h.logf("ctl: --> command %s, payload_len=%d\n", cmdName, len(data))
|
|
||||||
if len(data) != 0 {
|
if len(data) != 0 {
|
||||||
h.logData(data)
|
h.logData(data)
|
||||||
}
|
}
|
||||||
@ -244,8 +208,6 @@ func (h *Hyperstart) handleCtl() {
|
|||||||
// answer back with the message exit status
|
// answer back with the message exit status
|
||||||
// XXX: may be interesting to be able to configure the mock
|
// XXX: may be interesting to be able to configure the mock
|
||||||
// hyperstart to fail and test the reaction of proxy/clients
|
// hyperstart to fail and test the reaction of proxy/clients
|
||||||
h.logf("ctl: <-- command %s executed successfully\n", cmdName)
|
|
||||||
|
|
||||||
h.SendMessage(hyper.AckCode, nil)
|
h.SendMessage(hyper.AckCode, nil)
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -274,8 +236,6 @@ func (h *Hyperstart) SendIo(seq uint64, data []byte) {
|
|||||||
length := ioHeaderSize + len(data)
|
length := ioHeaderSize + len(data)
|
||||||
header := make([]byte, ioHeaderSize)
|
header := make([]byte, ioHeaderSize)
|
||||||
|
|
||||||
h.logf("io: <-- writing %d bytes for seq %d\n", len(data), seq)
|
|
||||||
|
|
||||||
binary.BigEndian.PutUint64(header[:], seq)
|
binary.BigEndian.PutUint64(header[:], seq)
|
||||||
binary.BigEndian.PutUint32(header[8:], uint32(length))
|
binary.BigEndian.PutUint32(header[8:], uint32(length))
|
||||||
h.writeIo(header)
|
h.writeIo(header)
|
||||||
@ -329,15 +289,14 @@ func (h *Hyperstart) startListening(path string, cb acceptCb) *net.UnixListener
|
|||||||
assert.Nil(h.t, err)
|
assert.Nil(h.t, err)
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
h.logf("%s: waiting for connection\n", path)
|
|
||||||
c, err := l.Accept()
|
c, err := l.Accept()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
h.logf("%s: Connection failed %s\n", path, err)
|
||||||
cb(nil)
|
cb(nil)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
cb(c)
|
cb(c)
|
||||||
h.logf("%s: accepted connection\n", path)
|
|
||||||
}()
|
}()
|
||||||
|
|
||||||
return l
|
return l
|
||||||
@ -346,7 +305,6 @@ func (h *Hyperstart) startListening(path string, cb acceptCb) *net.UnixListener
|
|||||||
// Start will
|
// Start will
|
||||||
// Once finished with the Hyperstart object, Close must be called.
|
// Once finished with the Hyperstart object, Close must be called.
|
||||||
func (h *Hyperstart) Start() {
|
func (h *Hyperstart) Start() {
|
||||||
h.log("start")
|
|
||||||
h.wgConnected.Add(1)
|
h.wgConnected.Add(1)
|
||||||
h.wgConnected.Add(1)
|
h.wgConnected.Add(1)
|
||||||
h.ctlListener = h.startListening(h.ctlSocketPath, func(s net.Conn) {
|
h.ctlListener = h.startListening(h.ctlSocketPath, func(s net.Conn) {
|
||||||
@ -394,6 +352,4 @@ func (h *Hyperstart) Stop() {
|
|||||||
|
|
||||||
os.Remove(h.ctlSocketPath)
|
os.Remove(h.ctlSocketPath)
|
||||||
os.Remove(h.ioSocketPath)
|
os.Remove(h.ioSocketPath)
|
||||||
|
|
||||||
h.log("stopped")
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user