Changed according to the comments.

Signed-off-by: Daniel Milchev fixed-term.daniel.milchev@bosch.io
eclipse-kanto · Oct 24, 2023 · 3df3168 · 3df3168
1 parent 8a5786c
commit 3df3168
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/containerm/ctr/ctrd_client_internal_test.go b/containerm/ctr/ctrd_client_internal_test.go
@@ -129,6 +129,22 @@ func TestConfigureRuncRuntime(t *testing.T) {
 			},
 			runtime: ctrdClient.runcRuntime,
 		},
+		"RuntimeTypeV2runcV1": {
+			container: &types.Container{
+				HostConfig: &types.HostConfig{
+					Runtime: types.RuntimeTypeV2runcV1,
+				},
+			},
+			runtime: ctrdClient.runcRuntime,
+		},
+		"RuntimeTypeV2runcV2": {
+			container: &types.Container{
+				HostConfig: &types.HostConfig{
+					Runtime: types.RuntimeTypeV2runcV2,
+				},
+			},
+			runtime: ctrdClient.runcRuntime,
+		},
 		"test_default": {
 			container: &types.Container{
 				HostConfig: &types.HostConfig{

diff --git a/containerm/ctr/ctrd_container_create_opts_test.go b/containerm/ctr/ctrd_container_create_opts_test.go
@@ -24,7 +24,6 @@ import (
 func TestWithRuntimeOpts(t *testing.T) {
 	tests := map[string]struct {
 		container       *types.Container
-		runtimeRootPath string
 	}{
 		"test_runtime_type_v1": {
 			&types.Container{
@@ -34,7 +33,6 @@ func TestWithRuntimeOpts(t *testing.T) {
 					Runtime: types.RuntimeTypeV1,
 				},
 			},
-			"",
 		},
 		"test_runtime_type_v2": {
 			&types.Container{
@@ -44,7 +42,6 @@ func TestWithRuntimeOpts(t *testing.T) {
 					Runtime: types.RuntimeTypeV2runcV1,
 				},
 			},
-			"",
 		},
 		"testing_default": {
 			&types.Container{
@@ -54,54 +51,47 @@ func TestWithRuntimeOpts(t *testing.T) {
 					Runtime: "",
 				},
 			},
-			"",
 		},
 	}
 	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			got := WithRuntimeOpts(test.container, test.runtimeRootPath)
+			got := WithRuntimeOpts(test.container, "")
 			testutil.AssertNotNil(t, got)
 		})
 	}
 }
 
 func TestWithSpecOpts(t *testing.T) {
-
 	tests := map[string]struct {
 		container *types.Container
-		image     containerd.Image
-		execRoot  string
 	}{
-		"test_privileged": {
+		"test_config": {
 			&types.Container{
 				Config: &types.ContainerConfiguration{
 					Cmd: []string{"test"},
 					Env: []string{"test"},
 				},
+				HostConfig: &types.HostConfig{},
+			},
+		},
+		"test_privileged": {
+			&types.Container{
 				HostConfig: &types.HostConfig{
 					Privileged: true,
 				},
 			},
-			containerd.NewImage(&containerd.Client{}, images.Image{}),
-			"/tmp/test",
 		},
 		"test_extra_capabilities": {
 			&types.Container{
-				Config: &types.ContainerConfiguration{
-					Cmd: []string{"test"},
-					Env: []string{"test"},
-				},
 				HostConfig: &types.HostConfig{
 					ExtraCapabilities: []string{"CAP_NET_ADMIN"},
 				},
 			},
-			containerd.NewImage(&containerd.Client{}, images.Image{}),
-			"/tmp/test",
 		},
 	}
-	for name, tests := range tests {
+	for name, test := range tests {
 		t.Run(name, func(t *testing.T) {
-			got := WithSpecOpts(tests.container, tests.image, tests.execRoot)
+			got := WithSpecOpts(test.container, containerd.NewImage(&containerd.Client{}, images.Image{}), "/tmp/test")
 			testutil.AssertNotNil(t, got)
 		})
 	}