From 8607a39e0886f83c9c9f34ae4457c927ef4a932e Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 28 Mar 2023 19:00:41 +0200 Subject: [PATCH 1/2] test: drop extraneous bracket in testsuite-74.mount.sh --- test/units/testsuite-74.mount.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/units/testsuite-74.mount.sh b/test/units/testsuite-74.mount.sh index 4890911fd00..3d4a48d6009 100755 --- a/test/units/testsuite-74.mount.sh +++ b/test/units/testsuite-74.mount.sh @@ -114,7 +114,7 @@ systemctl status "$(systemd-escape --path "$WORK_DIR/mnt").automount" losetup -d "$LOOP" unset LOOP # The automount unit should disappear once the underlying blockdev is gone -timeout 10s bash -c "while systemctl status '$(systemd-escape --path "$WORK_DIR/mnt").automount)'; do sleep .2; done" +timeout 10s bash -c "while systemctl status '$(systemd-escape --path "$WORK_DIR/mnt".automount)'; do sleep .2; done" # Mount a disk image systemd-mount --discover "$WORK_DIR/simple.img" From 208d9ad16840aa781efb68bb9c7b1d8f7d03760a Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 28 Mar 2023 20:41:38 +0200 Subject: [PATCH 2/2] test: fix regexp in testsuite-74.mount.sh Several whitespaces can separate "ext4" and "sd-mount-test" strings. --- test/units/testsuite-74.mount.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/units/testsuite-74.mount.sh b/test/units/testsuite-74.mount.sh index 3d4a48d6009..bfe472bef7a 100755 --- a/test/units/testsuite-74.mount.sh +++ b/test/units/testsuite-74.mount.sh @@ -122,7 +122,7 @@ systemd-mount --discover "$WORK_DIR/simple.img" test -e /run/media/system/simple.img/foo.bar # systemd-mount --list and systemd-umount require the loopback block device is initialized by udevd. udevadm settle --timeout 30 -assert_in "/dev/loop.* ext4 sd-mount-test" "$(systemd-mount --list --full)" +assert_in "/dev/loop.* ext4 +sd-mount-test" "$(systemd-mount --list --full)" systemd-umount "$WORK_DIR/simple.img" # --owner + vfat