mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-10 21:53:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests/int/checkpoint: drop unneeded tests

Browse Source 
Those tests were added by commit 8d180e96 ("Add support for Linux
Network Devices"), apparently by copy-pasting the test cases which
call simple_cr (all four of them).

While different simple_cr tests make sense as they cover different
code paths in runc and/or check for various regression, the same
variations with netdevice do not make sense, as having a net device
is orthogonal to e.g. bind mount, --debug, or cgroupns.

Remove those.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 2cd4782b70)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2026-04-03 16:40:06 -07:00
parent 68f0c46b2c
commit 68388249f1
1 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/checkpoint.bats
+3 -32
View File
@@ -138,7 +138,7 @@ function simple_cr() {
done
}
function simple_cr_with_netdevice() {
@test "checkpoint and restore with netdevice" {
# Set custom parameters to the netdevice to validate those are respected
mtu_value=1789
mac_address="00:11:22:33:44:55"
@@ -163,12 +163,12 @@ function simple_cr_with_netdevice() {
[[ "$output" == *"mtu $mtu_value "* ]]
for _ in $(seq 2); do
runc "$@" checkpoint --work-path ./work-dir test_busybox_netdevice
runc checkpoint --work-path ./work-dir test_busybox_netdevice
[ "$status" -eq 0 ]
testcontainer test_busybox_netdevice checkpointed
runc "$@" restore -d --work-path ./work-dir --console-socket "$CONSOLE_SOCKET" test_busybox_netdevice
runc restore -d --work-path ./work-dir --console-socket "$CONSOLE_SOCKET" test_busybox_netdevice
[ "$status" -eq 0 ]
testcontainer test_busybox_netdevice running
@@ -209,35 +209,6 @@ function simple_cr_with_netdevice() {
simple_cr
}
@test "checkpoint and restore with netdevice" {
simple_cr_with_netdevice
}
@test "checkpoint and restore with netdevice (bind mount, destination is symlink)" {
mkdir -p rootfs/real/conf
ln -s /real/conf rootfs/conf
update_config ' .mounts += [{
source: ".",
destination: "/conf",
options: ["bind"]
}]'
simple_cr_with_netdevice
}
@test "checkpoint and restore with netdevice (with --debug)" {
simple_cr_with_netdevice --debug
}
@test "checkpoint and restore with netdevice (cgroupns)" {
# cgroupv2 already enables cgroupns so this case was tested above already
requires cgroups_v1 cgroupns
# enable CGROUPNS
update_config '.linux.namespaces += [{"type": "cgroup"}]'
simple_cr_with_netdevice
}
@test "checkpoint --pre-dump (bad --parent-path)" {
runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
[ "$status" -eq 0 ]