github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 07:05:14 +00:00
Code Issues Projects Releases Wiki Activity

runtime: fix missing context argument in mocked sandbox APIs

Browse Source 
Missing context.Context in several APIs.

Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Peng Tao 2021-03-23 16:02:19 +08:00
parent 8ff62beeb4
commit 8e71c4fc7a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime/containerd-shim-v2/metrics_test.go
View File

@ -7,6 +7,7 @@
package containerdshim package containerdshim
import ( import (
"context"
"testing" "testing"
"github.com/containerd/cgroups" "github.com/containerd/cgroups"
@ -50,7 +51,7 @@ func TestStatNetworkMetric(t *testing.T) {
sandbox.StatsContainerFunc = nil sandbox.StatsContainerFunc = nil
}() }()
resp, err := sandbox.StatsContainer(testContainerID) resp, err := sandbox.StatsContainer(context.Background(), testContainerID)
assert.NoError(err) assert.NoError(err)
metrics := statsToMetrics(&resp) metrics := statsToMetrics(&resp)

5
src/runtime/containerd-shim-v2/shim_metrics_test.go
View File

@ -6,6 +6,7 @@
package containerdshim package containerdshim
import ( import (
"context"
"testing" "testing"
vc "github.com/kata-containers/kata-containers/src/runtime/virtcontainers" vc "github.com/kata-containers/kata-containers/src/runtime/virtcontainers"
@ -83,7 +84,7 @@ func TestStatsSandbox(t *testing.T) {
containers: make(map[string]*container), containers: make(map[string]*container),
} }
initialSandboxStats, initialContainerStats, err := s.statsSandbox() initialSandboxStats, initialContainerStats, err := s.statsSandbox(context.Background())
assert.Nil(err) assert.Nil(err)
assert.Equal(uint64(1000*1e9), initialSandboxStats.CgroupStats.CPUStats.CPUUsage.TotalUsage) assert.Equal(uint64(1000*1e9), initialSandboxStats.CgroupStats.CPUStats.CPUUsage.TotalUsage)
assert.Equal(2, len(initialContainerStats)) assert.Equal(2, len(initialContainerStats))
@ -96,7 +97,7 @@ func TestStatsSandbox(t *testing.T) {
sandbox.StatsFunc = getSandboxCPUFunc(2000, 110000) sandbox.StatsFunc = getSandboxCPUFunc(2000, 110000)
sandbox.StatsContainerFunc = getStatsContainerCPUFunc(200, 400, 20000, 40000) sandbox.StatsContainerFunc = getStatsContainerCPUFunc(200, 400, 20000, 40000)
finishSandboxStats, finishContainersStats, err := s.statsSandbox() finishSandboxStats, finishContainersStats, err := s.statsSandbox(context.Background())
// calc overhead // calc overhead
mem, cpu := calcOverhead(initialSandboxStats, finishSandboxStats, initialContainerStats, finishContainersStats, 1e9) mem, cpu := calcOverhead(initialSandboxStats, finishSandboxStats, initialContainerStats, finishContainersStats, 1e9)

6
src/runtime/virtcontainers/pkg/vcmock/sandbox.go
View File

@ -71,12 +71,12 @@ func (s *Sandbox) Release(ctx context.Context) error {
} }
// Start implements the VCSandbox function of the same name. // Start implements the VCSandbox function of the same name.
func (s *Sandbox) Start() error { func (s *Sandbox) Start(ctx context.Context) error {
return nil return nil
} }
// Stop implements the VCSandbox function of the same name. // Stop implements the VCSandbox function of the same name.
func (s *Sandbox) Stop(force bool) error { func (s *Sandbox) Stop(ctx context.Context, force bool) error {
return nil return nil
} }
@ -114,7 +114,7 @@ func (s *Sandbox) StartContainer(ctx context.Context, contID string) (vc.VCConta
} }
// StopContainer implements the VCSandbox function of the same name. // StopContainer implements the VCSandbox function of the same name.
func (s *Sandbox) StopContainer(contID string, force bool) (vc.VCContainer, error) { func (s *Sandbox) StopContainer(ctx context.Context, contID string, force bool) (vc.VCContainer, error) {
return &Container{}, nil return &Container{}, nil
} }