github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix CRI integration tests

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2023-10-14 12:16:40 -07:00
parent f76eaf5a6b
commit 3d53fbe858
No known key found for this signature in database
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
integration/issue7496_linux_test.go
View File

@ -28,7 +28,7 @@ import (
"testing" "testing"
"time" "time"
apitask "github.com/containerd/containerd/api/runtime/task/v2" apitask "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/integration/images" "github.com/containerd/containerd/integration/images"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/runtime/v2/shim"
@ -111,7 +111,7 @@ func TestIssue7496(t *testing.T) {
// example, umount overlayfs rootfs which doesn't with volatile. // example, umount overlayfs rootfs which doesn't with volatile.
// //
// REF: https://man7.org/linux/man-pages/man1/strace.1.html // REF: https://man7.org/linux/man-pages/man1/strace.1.html
func injectDelayToUmount2(ctx context.Context, t *testing.T, shimCli apitask.TaskService, delayInSec int) chan struct{} { func injectDelayToUmount2(ctx context.Context, t *testing.T, shimCli apitask.TTRPCTaskService, delayInSec int) chan struct{} {
pid := shimPid(ctx, t, shimCli) pid := shimPid(ctx, t, shimCli)
doneCh := make(chan struct{}) doneCh := make(chan struct{})
@ -153,7 +153,7 @@ func injectDelayToUmount2(ctx context.Context, t *testing.T, shimCli apitask.Tas
return doneCh return doneCh
} }
func connectToShim(ctx context.Context, t *testing.T, id string) apitask.TaskService { func connectToShim(ctx context.Context, t *testing.T, id string) apitask.TTRPCTaskService {
addr, err := shim.SocketAddress(ctx, containerdEndpoint, id) addr, err := shim.SocketAddress(ctx, containerdEndpoint, id)
require.NoError(t, err) require.NoError(t, err)
addr = strings.TrimPrefix(addr, "unix://") addr = strings.TrimPrefix(addr, "unix://")
@ -162,10 +162,10 @@ func connectToShim(ctx context.Context, t *testing.T, id string) apitask.TaskSer
require.NoError(t, err) require.NoError(t, err)
client := ttrpc.NewClient(conn) client := ttrpc.NewClient(conn)
return apitask.NewTaskClient(client) return apitask.NewTTRPCTaskClient(client)
} }
func shimPid(ctx context.Context, t *testing.T, shimCli apitask.TaskService) uint32 { func shimPid(ctx context.Context, t *testing.T, shimCli apitask.TTRPCTaskService) uint32 {
resp, err := shimCli.Connect(ctx, &apitask.ConnectRequest{}) resp, err := shimCli.Connect(ctx, &apitask.ConnectRequest{})
require.NoError(t, err) require.NoError(t, err)
return resp.GetShimPid() return resp.GetShimPid()

2
integration/issue7496_shutdown_linux_test.go
View File

@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
apitask "github.com/containerd/containerd/api/runtime/task/v2" apitask "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
) )

2
runtime/v2/shim/shim.go
View File

@ -30,7 +30,7 @@ import (
"runtime/debug" "runtime/debug"
"time" "time"
shimapi "github.com/containerd/containerd/api/runtime/task/v2" shimapi "github.com/containerd/containerd/api/runtime/task/v3"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/pkg/shutdown" "github.com/containerd/containerd/pkg/shutdown"