github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-28 20:15:51 +00:00
Code Issues Projects Releases Wiki Activity

runtime: remove global sandbox variable

Browse Source 
Remove global sandbox variable, and save *Sandbox to hypervisor struct.
For some needs, hypervisor may need to use methods from Sandbox.

Signed-off-by: bin liu <bin@hyper.sh>
This commit is contained in:
bin liu
2020-11-04 16:18:09 +08:00
parent 290203943c
commit 4e3a8c0124
19 changed files with 59 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/runtime/virtcontainers/pkg/vcmock/mock_test.go
View File

@@ -17,13 +17,13 @@ import (
)
const (
testSandboxID = "testSandboxID"
testContainerID = "testContainerID"
)
var (
loggerTriggered = 0
factoryTriggered = 0
loggerTriggered = 0
factoryTriggered = 0
testSandbox vc.VCSandbox = &Sandbox{}
)
func TestVCImplementations(t *testing.T) {
@@ -178,21 +178,21 @@ func TestVCMockCleanupContainer(t *testing.T) {
assert.Nil(m.CleanupContainerFunc)
ctx := context.Background()
err := m.CleanupContainer(ctx, testSandboxID, testContainerID, false)
err := m.CleanupContainer(ctx, testSandbox, testContainerID, false)
assert.Error(err)
assert.True(IsMockError(err))
m.CleanupContainerFunc = func(ctx context.Context, sandboxID, containerID string, force bool) error {
m.CleanupContainerFunc = func(ctx context.Context, sandbox vc.VCSandbox, containerID string, force bool) error {
return nil
}
err = m.CleanupContainer(ctx, testSandboxID, testContainerID, false)
err = m.CleanupContainer(ctx, testSandbox, testContainerID, false)
assert.NoError(err)
// reset
m.CleanupContainerFunc = nil
err = m.CleanupContainer(ctx, testSandboxID, testContainerID, false)
err = m.CleanupContainer(ctx, testSandbox, testContainerID, false)
assert.Error(err)
assert.True(IsMockError(err))
}
@@ -204,21 +204,21 @@ func TestVCMockForceCleanupContainer(t *testing.T) {
assert.Nil(m.CleanupContainerFunc)
ctx := context.Background()
err := m.CleanupContainer(ctx, testSandboxID, testContainerID, true)
err := m.CleanupContainer(ctx, testSandbox, testContainerID, true)
assert.Error(err)
assert.True(IsMockError(err))
m.CleanupContainerFunc = func(ctx context.Context, sandboxID, containerID string, force bool) error {
m.CleanupContainerFunc = func(ctx context.Context, sandbox vc.VCSandbox, containerID string, force bool) error {
return nil
}
err = m.CleanupContainer(ctx, testSandboxID, testContainerID, true)
err = m.CleanupContainer(ctx, testSandbox, testContainerID, true)
assert.NoError(err)
// reset
m.CleanupContainerFunc = nil
err = m.CleanupContainer(ctx, testSandboxID, testContainerID, true)
err = m.CleanupContainer(ctx, testSandbox, testContainerID, true)
assert.Error(err)
assert.True(IsMockError(err))
}