Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tests in debian testing (mount_sshfs.bats) - minimal fix #4245

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Fix tests in debian testing (mount_sshfs.bats) - minimal fix #4245

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5052c07
tests/integration/mounts_sshfs.bats: Fix test on debian testing
rata Apr 3, 2024
6b1f730
tests/integration: Fix remount on debian testing
rata Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tests/integration/mounts_sshfs.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function setup_sshfs() {
fi
# Reset atime flags. "diratime" is quite a strange flag, so we need to make
# sure it's cleared before we apply the requested flags.
mount --bind -o remount,diratime,strictatime "$DIR"
mount --bind -o remount,diratime,atime,strictatime "$DIR"
# We need to set the mount flags separately on the mount because some mount
# flags (such as "ro") are set on the superblock if you do them in the
# initial mount, which means that they cannot be cleared by bind-mounts.
Expand Down Expand Up @@ -393,7 +393,11 @@ function fail_sshfs_bind_flags() {
pass_sshfs_bind_flags "nodiratime" "bind"
run -0 grep -wq nodiratime <<<"$mnt_flags"
# MS_DIRATIME implies MS_RELATIME by default.
run -0 grep -wq relatime <<<"$mnt_flags"
# Let's check either relatime is set or no other option that removes
# relatime semantics is set.
# The latter case is needed in debian. For more info, see issue: #4093
run -0 grep -wq relatime <<<"$mnt_flags" ||
(run ! grep -wqE 'strictatime|norelatime|noatime' <<<"$mnt_flags")

pass_sshfs_bind_flags "noatime,nodiratime" "bind"
run -0 grep -wq noatime <<<"$mnt_flags"
Expand Down
Loading