Skip to content

Commit 6c535e0

Browse files
committed
tests/integration/mounts_sshfs.bats: Fix test on debian testing
relatime is not shown on some debian systems. Let's check that no other setting that removes the relatime effect is set, as that should be enough too. For more info, see the issue linked in the comments. Signed-off-by: Rodrigo Campos <rodrigo@sdfg.com.ar>
1 parent 7a4bb7b commit 6c535e0

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

tests/integration/mounts_sshfs.bats

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,13 @@ function fail_sshfs_bind_flags() {
390390
pass_sshfs_bind_flags "nodiratime" "bind"
391391
run -0 grep -wq nodiratime <<<"$mnt_flags"
392392
# MS_DIRATIME implies MS_RELATIME by default.
393-
run -0 grep -wq relatime <<<"$mnt_flags"
393+
# Let's check either relatime is set or no other option that removes
394+
# relatime semantics is set.
395+
# The latter case is needed in debian. For more info, see issue: #4093
396+
run -0 grep -wq relatime <<<"$mnt_flags" ||
397+
(run -0 grep -wqv strictatime <<<"$mnt_flags" &&
398+
run -0 grep -wqv norelatime <<<"$mnt_flags" &&
399+
run -0 grep -wqv noatime <<<"$mnt_flags")
394400

395401
pass_sshfs_bind_flags "noatime,nodiratime" "bind"
396402
run -0 grep -wq noatime <<<"$mnt_flags"

0 commit comments

Comments
 (0)