jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests/checkpoint.bats: consolidate requires checks 

Since all the criu tests have the same requirements,
move them to setup().

While at it, remove an obviously redundant comment.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin 2020-04-19 21:31:09 -07:00
parent e216457eea
commit bf172ef44f
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/integration/checkpoint.bats
View File

@ -8,6 +8,8 @@ function setup() {
fi fi
# All checkpoint tests are currently failing on v2 # All checkpoint tests are currently failing on v2
requires cgroups_v1 requires cgroups_v1
# XXX: currently criu require root containers.
requires criu root
teardown_busybox teardown_busybox
setup_busybox setup_busybox
@ -18,9 +20,6 @@ function teardown() {
} }
@test "checkpoint and restore" { @test "checkpoint and restore" {
# XXX: currently criu require root containers.
requires criu root
runc run -d --console-socket $CONSOLE_SOCKET test_busybox runc run -d --console-socket $CONSOLE_SOCKET test_busybox
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
@ -47,9 +46,6 @@ function teardown() {
} }
@test "checkpoint --pre-dump and restore" { @test "checkpoint --pre-dump and restore" {
# XXX: currently criu require root containers.
requires criu root
# The changes to 'terminal' are needed for running in detached mode # The changes to 'terminal' are needed for running in detached mode
sed -i 's;"terminal": true;"terminal": false;' config.json sed -i 's;"terminal": true;"terminal": false;' config.json
sed -i 's/"sh"/"sh","-c","for i in `seq 10`; do read xxx || continue; echo ponG $xxx; done"/' config.json sed -i 's/"sh"/"sh","-c","for i in `seq 10`; do read xxx || continue; echo ponG $xxx; done"/' config.json
@ -120,13 +116,9 @@ function teardown() {
} }
@test "checkpoint --lazy-pages and restore" { @test "checkpoint --lazy-pages and restore" {
# XXX: currently criu require root containers.
requires criu root
# check if lazy-pages is supported # check if lazy-pages is supported
run ${CRIU} check --feature uffd-noncoop run ${CRIU} check --feature uffd-noncoop
if [ "$status" -eq 1 ]; then if [ "$status" -eq 1 ]; then
# this criu does not support lazy migration; skip the test
skip "this criu does not support lazy migration" skip "this criu does not support lazy migration"
fi fi
@ -229,9 +221,6 @@ function teardown() {
} }
@test "checkpoint and restore in external network namespace" { @test "checkpoint and restore in external network namespace" {
# XXX: currently criu require root containers.
requires criu root
# check if external_net_ns is supported; only with criu 3.10++ # check if external_net_ns is supported; only with criu 3.10++
run ${CRIU} check --feature external_net_ns run ${CRIU} check --feature external_net_ns
if [ "$status" -eq 1 ]; then if [ "$status" -eq 1 ]; then
@ -289,9 +278,6 @@ function teardown() {
} }
@test "checkpoint and restore with container specific CRIU config" { @test "checkpoint and restore with container specific CRIU config" {
# XXX: currently criu require root containers.
requires criu root
tmp=`mktemp /tmp/runc-criu-XXXXXX.conf` tmp=`mktemp /tmp/runc-criu-XXXXXX.conf`
# This is the file we write to /etc/criu/default.conf # This is the file we write to /etc/criu/default.conf
tmplog1=`mktemp /tmp/runc-criu-log-XXXXXX.log` tmplog1=`mktemp /tmp/runc-criu-log-XXXXXX.log`