Merge pull request #4267 from kolyshkin/test-testdata-rm

test/testdata: rm some files
cri-o · Oct 15, 2020 · b49cac4 · b49cac4
2 parents e7c64e8 + d04aa90
commit b49cac4
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 522 deletions.
diff --git a/test/ctr.bats b/test/ctr.bats
@@ -534,7 +534,11 @@ function wait_until_exit() {
 	fi
 
 	start_crio
-	pod_id=$(crictl runp "$TESTDATA"/sandbox_config_privileged.json)
+	sandbox_config="$TESTDIR"/sandbox_config.json
+
+	jq '	  .linux.security_context.privileged = true' \
+		"$TESTDATA"/sandbox_config.json > "$sandbox_config"
+	pod_id=$(crictl runp "$sandbox_config")
 
 	jq '	  .devices = [ {
 			host_path: "/dev/null",
@@ -544,7 +548,7 @@ function wait_until_exit() {
 		| .linux.security_context.privileged = true' \
 		"$TESTDATA"/container_redis.json > "$newconfig"
 
-	ctr_id=$(crictl create "$pod_id" "$newconfig" "$TESTDATA"/sandbox_config_privileged.json)
+	ctr_id=$(crictl create "$pod_id" "$newconfig" "$sandbox_config")
 	crictl start "$ctr_id"
 
 	output=$(crictl exec --sync "$ctr_id" ls /dev/mynull)
@@ -559,7 +563,11 @@ function wait_until_exit() {
 	fi
 
 	start_crio
-	pod_id=$(crictl runp "$TESTDATA"/sandbox_config_privileged.json)
+	sandbox_config="$TESTDIR"/sandbox_config.json
+
+	jq '	  .linux.security_context.privileged = true' \
+		"$TESTDATA"/sandbox_config.json > "$sandbox_config"
+	pod_id=$(crictl runp "$sandbox_config")
 
 	jq '	  .devices = [ {
 			host_path: "/dev/null",
@@ -571,7 +579,7 @@ function wait_until_exit() {
 		"$TESTDATA"/container_redis.json > "$newconfig"
 
 	# Error is "configured with a device container path that already exists on the host"
-	! crictl create "$pod_id" "$newconfig" "$TESTDATA"/sandbox_config_privileged.json
+	! crictl create "$pod_id" "$newconfig" "$sandbox_config"
 }
 
 @test "ctr hostname env" {
@@ -711,11 +719,17 @@ function wait_until_exit() {
 @test "ctr /etc/resolv.conf rw/ro mode" {
 	start_crio
 	pod_id=$(crictl runp "$TESTDATA"/sandbox_config.json)
-	ctr_id=$(crictl create "$pod_id" "$TESTDATA"/container_config_resolvconf.json "$TESTDATA"/sandbox_config.json)
+	jq '	  .command = ["sh", "-c", "echo test >> /etc/resolv.conf"]' \
+		"$TESTDATA"/container_config.json > "$newconfig"
+	ctr_id=$(crictl create "$pod_id" "$newconfig" "$TESTDATA"/sandbox_config.json)
 	crictl start "$ctr_id"
 	wait_until_exit "$ctr_id"
 
-	ctr_id=$(crictl create "$pod_id" "$TESTDATA"/container_config_resolvconf_ro.json "$TESTDATA"/sandbox_config.json)
+	jq '	  .command = ["sh", "-c", "echo test >> /etc/resolv.conf"]
+		| .linux.security_context.readonly_rootfs = true
+		| .metadata.name = "test-resolv-ro"' \
+		"$TESTDATA"/container_config.json > "$newconfig"
+	ctr_id=$(crictl create "$pod_id" "$newconfig" "$TESTDATA"/sandbox_config.json)
 	crictl start "$ctr_id"
 	wait_until_exit "$ctr_id"
 }
@@ -834,8 +848,10 @@ function wait_until_exit() {
 @test "ctr execsync conflicting with conmon env" {
 	start_crio
 	pod_id=$(crictl runp "$TESTDATA"/sandbox_config.json)
-	ctr_id=$(crictl create "$pod_id" "$TESTDATA"/container_redis_env_custom.json "$TESTDATA"/sandbox_config.json)
-	crictl start "$ctr_id"
+	# XXX: this relies on PATH being the first element in envs[]
+	jq '	  .envs[0].value += ":/acustompathinpath"' \
+		"$TESTDATA"/container_config.json > "$newconfig"
+	ctr_id=$(crictl create "$pod_id" "$newconfig" "$TESTDATA"/sandbox_config.json)
 
 	output=$(crictl exec "$ctr_id" env)
 	[[ "$output" == *"acustompathinpath"* ]]
@@ -917,10 +933,15 @@ function wait_until_exit() {
 @test "privileged ctr -- check for rw mounts" {
 	start_crio
 
-	pod_id=$(crictl runp "$TESTDATA"/sandbox_config_privileged.json)
+	sandbox_config="$TESTDIR"/sandbox_config.json
+
+	jq '	  .linux.security_context.privileged = true' \
+		"$TESTDATA"/sandbox_config.json > "$sandbox_config"
+	pod_id=$(crictl runp "$sandbox_config")
+
 	jq '	  .linux.security_context.privileged = true' \
 		"$TESTDATA"/container_redis.json > "$newconfig"
-	ctr_id=$(crictl create "$pod_id" "$newconfig" "$TESTDATA"/sandbox_config_privileged.json)
+	ctr_id=$(crictl create "$pod_id" "$newconfig" "$sandbox_config")
 	crictl start "$ctr_id"
 
 	output=$(crictl inspect "$ctr_id")

diff --git a/test/testdata/container_config_resolvconf.json b/test/testdata/container_config_resolvconf.json
diff --git a/test/testdata/container_config_resolvconf_ro.json b/test/testdata/container_config_resolvconf_ro.json
diff --git a/test/testdata/container_exit_test.json b/test/testdata/container_exit_test.json
diff --git a/test/testdata/container_redis_env_custom.json b/test/testdata/container_redis_env_custom.json
diff --git a/test/testdata/sandbox_config_hostnet.json b/test/testdata/sandbox_config_hostnet.json