check that runc-test_busybox.scope is removed

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
opencontainers · Mar 22, 2023 · 2c2b89b · 2c2b89b
1 parent c8200ba
commit 2c2b89b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -71,7 +71,7 @@ task:
     HOME: /root
     CIRRUS_WORKING_DIR: /home/runc
     GO_VERSION: "1.19"
-    BATS_VERSION: "v1.3.0"
+    BATS_VERSION: "v1.9.0"
     RPMS: gcc git iptables jq glibc-static libseccomp-devel make criu fuse-sshfs
     # yamllint disable rule:key-duplicates
     matrix:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG GO_VERSION=1.19
-ARG BATS_VERSION=v1.3.0
+ARG BATS_VERSION=v1.9.0
 ARG LIBSECCOMP_VERSION=2.5.4
 
 FROM golang:${GO_VERSION}-bullseye

diff --git a/tests/integration/helpers.bash b/tests/integration/helpers.bash
@@ -609,6 +609,15 @@ function teardown_bundle() {
 		__runc delete -f "$ct"
 	done
 	rm -rf "$ROOT"
+	# Check that systemd unit is removed.
+	if [ -v RUNC_USE_SYSTEMD ]; then
+		run systemctl status runc-test_busybox.scope
+		echo "$output"
+		[ "$status" -eq 4 ] # "no such unit"
+		if ls /run/systemd/transient/runc-test_busybox.scope.d; then
+			fail "should not have test_busybox left"
+		fi
+	fi
 	remove_parent
 }