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

Rename all variables to remove "cricontainerd".

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-03-19 21:59:32 +00:00
parent 9afdd1956b
commit 387da59ee5
54 changed files with 156 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
integration/image_load_test.go
View File

@@ -58,7 +58,7 @@ func TestImageLoad(t *testing.T) {
}
t.Logf("load image in cri")
res, err := criContainerdClient.LoadImage(context.Background(), &api.LoadImageRequest{FilePath: tar})
res, err := criPluginClient.LoadImage(context.Background(), &api.LoadImageRequest{FilePath: tar})
require.NoError(t, err)
require.Equal(t, []string{loadedImage}, res.GetImages())

18
integration/test_utils.go
View File

@@ -45,14 +45,14 @@ const (
)
var (
runtimeService cri.RuntimeService
imageService cri.ImageManagerService
containerdClient *containerd.Client
criContainerdClient api.CRIContainerdServiceClient
runtimeService cri.RuntimeService
imageService cri.ImageManagerService
containerdClient *containerd.Client
criPluginClient api.CRIPluginServiceClient
)
var criContainerdEndpoint = flag.String("cri-endpoint", "/run/containerd/containerd.sock", "The endpoint of cri plugin.")
var criContainerdRoot = flag.String("cri-root", "/var/lib/containerd/io.containerd.grpc.v1.cri", "The root directory of cri plugin.")
var criEndpoint = flag.String("cri-endpoint", "/run/containerd/containerd.sock", "The endpoint of cri plugin.")
var criRoot = flag.String("cri-root", "/var/lib/containerd/io.containerd.grpc.v1.cri", "The root directory of cri plugin.")
func init() {
flag.Parse()
@@ -64,11 +64,11 @@ func init() {
// ConnectDaemons connect cri plugin and containerd, and initialize the clients.
func ConnectDaemons() error {
var err error
runtimeService, err = remote.NewRemoteRuntimeService(*criContainerdEndpoint, timeout)
runtimeService, err = remote.NewRemoteRuntimeService(*criEndpoint, timeout)
if err != nil {
return errors.Wrap(err, "failed to create runtime service")
}
imageService, err = remote.NewRemoteImageService(*criContainerdEndpoint, timeout)
imageService, err = remote.NewRemoteImageService(*criEndpoint, timeout)
if err != nil {
return errors.Wrap(err, "failed to create image service")
}
@@ -87,7 +87,7 @@ func ConnectDaemons() error {
if err != nil {
return errors.Wrap(err, "failed to connect containerd")
}
criContainerdClient, err = client.NewCRIContainerdClient(*criContainerdEndpoint, timeout)
criPluginClient, err = client.NewCRIPluginClient(*criEndpoint, timeout)
if err != nil {
return errors.Wrap(err, "failed to connect cri plugin")
}

2
integration/volume_copy_up_test.go
View File

@@ -70,7 +70,7 @@ func TestVolumeCopyUp(t *testing.T) {
assert.Equal(t, "test_content\n", string(stdout))
t.Logf("Check host path of the volume")
hostCmd := fmt.Sprintf("ls %s/containers/%s/volumes/*/test_file | xargs cat", *criContainerdRoot, cn)
hostCmd := fmt.Sprintf("ls %s/containers/%s/volumes/*/test_file | xargs cat", *criRoot, cn)
output, err := exec.Command("sh", "-c", hostCmd).CombinedOutput()
require.NoError(t, err)
assert.Equal(t, "test_content\n", string(output))