From 40c3be4828499eb26ab1cdea80c87fed2dda4b0c Mon Sep 17 00:00:00 2001 From: Ivan Kruglov Date: Wed, 18 Dec 2024 19:08:00 +0100 Subject: [PATCH] machine: tests for io.systemd.Machine.BindMount --- test/units/TEST-13-NSPAWN.machined.sh | 2 ++ test/units/TEST-13-NSPAWN.nspawn.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/units/TEST-13-NSPAWN.machined.sh b/test/units/TEST-13-NSPAWN.machined.sh index a0a10ef3074..11f6a6f483d 100755 --- a/test/units/TEST-13-NSPAWN.machined.sh +++ b/test/units/TEST-13-NSPAWN.machined.sh @@ -401,6 +401,8 @@ varlinkctl call /run/systemd/machine/io.systemd.Machine io.systemd.Machine.Open timeout 30 bash -c "until test -e /tmp/none-existent-file; do sleep .5; done" grep -q "BAR" /tmp/none-existent-file +# io.systemd.Machine.BindMount is covered by testcase_check_machinectl_bind() in nspawn tests + # terminate machines machinectl terminate long-running # wait for the container being stopped, otherwise acquiring image metadata by io.systemd.MachineImage.List may fail in the below. diff --git a/test/units/TEST-13-NSPAWN.nspawn.sh b/test/units/TEST-13-NSPAWN.nspawn.sh index f5615755820..1b0ff77889d 100755 --- a/test/units/TEST-13-NSPAWN.nspawn.sh +++ b/test/units/TEST-13-NSPAWN.nspawn.sh @@ -796,7 +796,7 @@ EOF testcase_machinectl_bind() { local service_path service_name root container_name ec - local cmd='for i in $(seq 1 20); do if test -f /tmp/marker; then exit 0; fi; sleep .5; done; exit 1;' + local cmd='for i in $(seq 1 20); do if test -f /tmp/marker && test -f /tmp/marker-varlink; then exit 0; fi; sleep .5; done; exit 1;' root="$(mktemp -d /var/lib/machines/TEST-13-NSPAWN.machinectl-bind.XXX)" create_dummy_container "$root" @@ -814,6 +814,8 @@ EOF systemctl start "$service_name" touch /tmp/marker machinectl bind --mkdir "$container_name" /tmp/marker + touch /tmp/marker-varlink + varlinkctl call /run/systemd/machine/io.systemd.Machine io.systemd.Machine.BindMount "{\"name\": \"$container_name\", \"source\": \"/tmp/marker-varlink\", \"mkdir\": true}" timeout 10 bash -c "while [[ '\$(systemctl show -P SubState $service_name)' == running ]]; do sleep .2; done" ec="$(systemctl show -P ExecMainStatus "$service_name")" -- 2.47.3