Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit 8506fe8

Browse files
Random-LiuRandom-Liu
authored
Merge pull request #939 from Random-Liu/cherrypick-#938-release-1.2
Cherrypick #938 to release/1.2
2 parents 33624c1 + f6db613 commit 8506fe8

27 files changed

Lines changed: 935 additions & 859 deletions

‎integration/addition_gids_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestAdditionalGids(t *testing.T) {
3636
t.Log("Create a sandbox with log directory")
3737
sbConfig := PodSandboxConfig("sandbox", "additional-gids",
3838
WithPodLogDirectory(testPodLogDir))
39-
sb, err := runtimeService.RunPodSandbox(sbConfig)
39+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
4040
require.NoError(t, err)
4141
defer func() {
4242
assert.NoError(t, runtimeService.StopPodSandbox(sb))

‎integration/container_log_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func TestLongContainerLog(t *testing.T) {
3939
sbConfig := PodSandboxConfig("sandbox", "long-container-log",
4040
WithPodLogDirectory(testPodLogDir),
4141
)
42-
sb, err := runtimeService.RunPodSandbox(sbConfig)
42+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
4343
require.NoError(t, err)
4444
defer func() {
4545
assert.NoError(t, runtimeService.StopPodSandbox(sb))

‎integration/container_stats_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
func TestContainerStats(t *testing.T) {
3232
t.Logf("Create a pod config and run sandbox container")
3333
sbConfig := PodSandboxConfig("sandbox1", "stats")
34-
sb, err := runtimeService.RunPodSandbox(sbConfig)
34+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
3535
require.NoError(t, err)
3636
defer func() {
3737
assert.NoError(t, runtimeService.StopPodSandbox(sb))
@@ -76,7 +76,7 @@ func TestContainerStats(t *testing.T) {
7676
func TestContainerListStats(t *testing.T) {
7777
t.Logf("Create a pod config and run sandbox container")
7878
sbConfig := PodSandboxConfig("running-pod", "statsls")
79-
sb, err := runtimeService.RunPodSandbox(sbConfig)
79+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
8080
require.NoError(t, err)
8181
defer func() {
8282
assert.NoError(t, runtimeService.StopPodSandbox(sb))
@@ -131,7 +131,7 @@ func TestContainerListStats(t *testing.T) {
131131
func TestContainerListStatsWithIdFilter(t *testing.T) {
132132
t.Logf("Create a pod config and run sandbox container")
133133
sbConfig := PodSandboxConfig("running-pod", "statsls")
134-
sb, err := runtimeService.RunPodSandbox(sbConfig)
134+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
135135
require.NoError(t, err)
136136
defer func() {
137137
assert.NoError(t, runtimeService.StopPodSandbox(sb))
@@ -191,7 +191,7 @@ func TestContainerListStatsWithIdFilter(t *testing.T) {
191191
func TestContainerListStatsWithSandboxIdFilter(t *testing.T) {
192192
t.Logf("Create a pod config and run sandbox container")
193193
sbConfig := PodSandboxConfig("running-pod", "statsls")
194-
sb, err := runtimeService.RunPodSandbox(sbConfig)
194+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
195195
require.NoError(t, err)
196196
defer func() {
197197
assert.NoError(t, runtimeService.StopPodSandbox(sb))
@@ -247,7 +247,7 @@ func TestContainerListStatsWithSandboxIdFilter(t *testing.T) {
247247
func TestContainerListStatsWithIdSandboxIdFilter(t *testing.T) {
248248
t.Logf("Create a pod config and run sandbox container")
249249
sbConfig := PodSandboxConfig("running-pod", "statsls")
250-
sb, err := runtimeService.RunPodSandbox(sbConfig)
250+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
251251
require.NoError(t, err)
252252
defer func() {
253253
assert.NoError(t, runtimeService.StopPodSandbox(sb))

‎integration/container_update_resources_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func checkMemoryLimit(t *testing.T, spec *runtimespec.Spec, memLimit int64) {
3939
func TestUpdateContainerResources(t *testing.T) {
4040
t.Log("Create a sandbox")
4141
sbConfig := PodSandboxConfig("sandbox", "update-container-resources")
42-
sb, err := runtimeService.RunPodSandbox(sbConfig)
42+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
4343
require.NoError(t, err)
4444
defer func() {
4545
assert.NoError(t, runtimeService.StopPodSandbox(sb))

‎integration/containerd_image_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func TestContainerdImage(t *testing.T) {
121121

122122
t.Logf("should be able to start container with the image")
123123
sbConfig := PodSandboxConfig("sandbox", "containerd-image")
124-
sb, err := runtimeService.RunPodSandbox(sbConfig)
124+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
125125
require.NoError(t, err)
126126
defer func() {
127127
assert.NoError(t, runtimeService.StopPodSandbox(sb))

‎integration/duplicate_name_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ import (
2626
func TestDuplicateName(t *testing.T) {
2727
t.Logf("Create a sandbox")
2828
sbConfig := PodSandboxConfig("sandbox", "duplicate-name")
29-
sb, err := runtimeService.RunPodSandbox(sbConfig)
29+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
3030
require.NoError(t, err)
3131
defer func() {
3232
assert.NoError(t, runtimeService.StopPodSandbox(sb))
3333
assert.NoError(t, runtimeService.RemovePodSandbox(sb))
3434
}()
3535

3636
t.Logf("Create the sandbox again should fail")
37-
_, err = runtimeService.RunPodSandbox(sbConfig)
37+
_, err = runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
3838
require.Error(t, err)
3939

4040
t.Logf("Create a container")

‎integration/image_load_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func TestImageLoad(t *testing.T) {
7070

7171
t.Logf("create a container with the loaded image")
7272
sbConfig := PodSandboxConfig("sandbox", Randomize("image-load"))
73-
sb, err := runtimeService.RunPodSandbox(sbConfig)
73+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
7474
require.NoError(t, err)
7575
defer func() {
7676
assert.NoError(t, runtimeService.StopPodSandbox(sb))

‎integration/imagefs_info_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestImageFSInfo(t *testing.T) {
3737
}()
3838
t.Logf("Create a sandbox to make sure there is an active snapshot")
3939
config := PodSandboxConfig("running-pod", "imagefs")
40-
sb, err := runtimeService.RunPodSandbox(config)
40+
sb, err := runtimeService.RunPodSandbox(config, *runtimeHandler)
4141
require.NoError(t, err)
4242
defer func() {
4343
assert.NoError(t, runtimeService.StopPodSandbox(sb))

‎integration/pod_hostname_env_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestPodHostnameEnv(t *testing.T) {
6363
opts := append(test.opts, WithPodLogDirectory(testPodLogDir))
6464
t.Log("Create a sandbox with hostname")
6565
sbConfig := PodSandboxConfig("sandbox", "hostname-env", opts...)
66-
sb, err := runtimeService.RunPodSandbox(sbConfig)
66+
sb, err := runtimeService.RunPodSandbox(sbConfig, *runtimeHandler)
6767
require.NoError(t, err)
6868
defer func() {
6969
assert.NoError(t, runtimeService.StopPodSandbox(sb))

‎integration/restart_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func TestContainerdRestart(t *testing.T) {
9191
for i := range sandboxes {
9292
s := &sandboxes[i]
9393
sbCfg := PodSandboxConfig(s.name, sandboxNS)
94-
sid, err := runtimeService.RunPodSandbox(sbCfg)
94+
sid, err := runtimeService.RunPodSandbox(sbCfg, *runtimeHandler)
9595
require.NoError(t, err)
9696
defer func() {
9797
// Make sure the sandbox is cleaned up in any case.

0 commit comments

Comments
 (0)