Skip to content

Commit 4f9e318

Browse files
committed
tests/int: add missing runc exit code checks
These places should check runc exit code but they don't. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 7cc09a0 commit 4f9e318

File tree

12 files changed

+26
-26
lines changed

12 files changed

+26
-26
lines changed

tests/integration/cgroups.bats

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function setup() {
9999
[[ ${lines[0]} = "0::/foo" ]]
100100

101101
# teardown: remove "/foo"
102-
cat <<'EOF' | runc exec test_cgroups_group sh -eux
102+
cat <<'EOF' | runc -0 exec test_cgroups_group sh -eux
103103
echo -memory > /sys/fs/cgroup/cgroup.subtree_control
104104
for pid in $(cat /sys/fs/cgroup/foo/cgroup.procs); do
105105
echo $pid > /sys/fs/cgroup/cgroup.procs || true
@@ -133,7 +133,7 @@ EOF
133133
if [[ "$status" -eq 0 ]]; then
134134
[ "$output" = 'default 750' ]
135135
else
136-
runc exec test_cgroups_unified sh -c 'cat /sys/fs/cgroup/io.weight'
136+
runc -0 exec test_cgroups_unified sh -c 'cat /sys/fs/cgroup/io.weight'
137137
[ "$output" = 'default 7475' ]
138138
fi
139139
}
@@ -181,7 +181,7 @@ EOF
181181
weights1=$(get_cgroup_value $file)
182182

183183
# Check that runc update works.
184-
runc update -r - test_dev_weight <<EOF
184+
runc -0 update -r - test_dev_weight <<EOF
185185
{
186186
"blockIO": {
187187
"weight": 111,
@@ -453,7 +453,7 @@ convert_hugetlb_size() {
453453
# Resume the container a bit later.
454454
(
455455
sleep 2
456-
runc resume ct1
456+
runc -0 resume ct1
457457
) &
458458

459459
# Exec should succeed (once the container is resumed).

tests/integration/delete.bats

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ function test_runc_delete_host_pidns() {
113113

114114
testcontainer test_busybox running
115115

116-
runc delete --force test_busybox
116+
runc -0 delete --force test_busybox
117117

118118
runc ! state test_busybox
119119
}
@@ -186,7 +186,7 @@ EOF
186186
[ -d "${path}" ] || fail "test failed to create memory sub-cgroup ($path not found)"
187187
done
188188

189-
runc delete --force test_busybox
189+
runc -0 delete --force test_busybox
190190

191191
runc ! state test_busybox
192192

@@ -228,7 +228,7 @@ EOF
228228
[ -d "$CGROUP_V2_PATH"/foo ]
229229

230230
# force delete test_busybox
231-
runc delete --force test_busybox
231+
runc -0 delete --force test_busybox
232232

233233
runc ! state test_busybox
234234

@@ -256,7 +256,7 @@ EOF
256256
# Expect "unit is not active" exit code.
257257
run -3 systemctl status $user "$SD_UNIT_NAME"
258258

259-
runc delete test-failed-unit
259+
runc -0 delete test-failed-unit
260260
# Expect "no such unit" exit code.
261261
run -4 systemctl status $user "$SD_UNIT_NAME"
262262
}

tests/integration/dev.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function teardown() {
5151
runc -1 exec test_deny sh -c 'head -n 1 /dev/kmsg'
5252
[[ "${output}" == *'Operation not permitted'* ]]
5353

54-
runc update test_deny --pids-limit 42
54+
runc -0 update test_deny --pids-limit 42
5555

5656
# test write
5757
runc -1 exec test_deny sh -c 'hostname | tee /dev/kmsg'
@@ -133,6 +133,6 @@ function teardown() {
133133
requires systemd_v230
134134

135135
set_cgroups_path
136-
runc run -d --console-socket "$CONSOLE_SOCKET" test_need_reload
136+
runc -0 run -d --console-socket "$CONSOLE_SOCKET" test_need_reload
137137
check_systemd_value "NeedDaemonReload" "no"
138138
}

tests/integration/events.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function test_events() {
6666
# Stress the CPU a bit. Need something that runs for more than 10s.
6767
runc -0 exec test_busybox dd if=/dev/zero bs=1 count=128K of=/dev/null
6868

69-
runc exec test_busybox sh -c 'tail /sys/fs/cgroup/*.pressure'
69+
runc -0 exec test_busybox sh -c 'tail /sys/fs/cgroup/*.pressure'
7070

7171
runc -0 events --stats test_busybox
7272

tests/integration/helpers.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function runc_spec() {
8585
local rootless=""
8686
[ $EUID -ne 0 ] && rootless="--rootless"
8787

88-
runc spec $rootless
88+
runc -0 spec $rootless
8989

9090
# Always add additional mappings if we have idmaps.
9191
if [[ $EUID -ne 0 && "$ROOTLESS_FEATURES" == *"idmap"* ]]; then

tests/integration/host-mntns.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function teardown() {
2424
| .linux.maskedPaths = []
2525
| .linux.readonlyPaths = []'
2626
runc -0 run test_host_mntns
27-
runc delete -f test_host_mntns
27+
runc -0 delete -f test_host_mntns
2828

2929
# There should be one such file.
3030
run -0 ls createRuntimeHook.*

tests/integration/netdev.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function teardown() {
5151

5252
# The network namespace owner controls the lifecycle of the interface.
5353
# The interface should remain on the namespace after the container was killed.
54-
runc delete --force test_busybox
54+
runc -0 delete --force test_busybox
5555

5656
# Move back the interface to the root namespace (pid 1).
5757
ip netns exec "$ns_name" ip link set dev dummy0 netns 1

tests/integration/pause.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function teardown() {
5151

5252
testcontainer test_busybox running
5353

54-
runc delete --force test_busybox
54+
runc -0 delete --force test_busybox
5555

5656
runc ! state test_busybox
5757
}

tests/integration/run.bats

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function teardown() {
2424

2525
runc -0 state test_run_keep
2626

27-
runc delete test_run_keep
27+
runc -0 delete test_run_keep
2828

2929
runc ! state test_run_keep
3030
}
@@ -45,7 +45,7 @@ function teardown() {
4545
# check that cgroup exists
4646
check_cgroup_value "pids.max" "max"
4747

48-
runc delete test_run_keep
48+
runc -0 delete test_run_keep
4949

5050
runc ! state test_run_keep
5151
}
@@ -177,7 +177,7 @@ function teardown() {
177177
fi
178178

179179
# ... as well as the timens offsets.
180-
runc exec attached_ctr cat /proc/self/timens_offsets
180+
runc -0 exec attached_ctr cat /proc/self/timens_offsets
181181
grep -E '^monotonic\s+7881\s+2718281$' <<<"$output"
182182
grep -E '^boottime\s+1337\s+3141519$' <<<"$output"
183183
}

tests/integration/seccomp-notify.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function scmp_act_notify_template() {
7373

7474
scmp_act_notify_template "sleep infinity" true '"mkdir"'
7575

76-
runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
76+
runc -0 run -d --console-socket "$CONSOLE_SOCKET" test_busybox
7777
runc -0 exec test_busybox /bin/sh -c "mkdir /dev/shm/foo && stat /dev/shm/foo-bar"
7878
}
7979

0 commit comments

Comments
 (0)