Fix some tests that fail for exfat FS
cover Fix some tests that fail for exfat FS
Mostly just do not run test that require posix permissions and ownership.
Pavel Reichl (5):
common: Add _require_{chown,chmod}() g/87,88,125,126,128,193,314,317,355: Add _require_chown/chmod
common: hide permision warning from mkswap for exfat generic/554: hide permision warning on exfat generic/003: Amend the test for exfat
common/rc | 26 +++++++++++++++++++++++++- tests/generic/003 | 29 ++++++++++++++++++++--------- tests/generic/087 | 1 + tests/generic/088 | 1 + tests/generic/125 | 1 + tests/generic/126 | 1 + tests/generic/128 | 1 + tests/generic/193 | 1 + tests/generic/314 | 1 + tests/generic/317 | 1 + tests/generic/355 | 1 + tests/generic/554 | 10 +++++++++- 12 files changed, 63 insertions(+), 11 deletions(-)
Signature · 1 line
2.30.2
PATCH 1/5 common: Add _require_{chown,chmod}()
Add helper function that ensures that test is only executed on file systems that implement chown and chmod.
--- common/rc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
common/rc +18 -0
@@ -2129,6 +2129,24 @@ _require_user() [ "$?" == "0" ] || _notrun "$qa_user cannot execute commands." } +# check for a chown support +# +_require_chown() +{ + if [ "$FSTYP" = "exfat" ]; then + _notrun "chown is not supported on $FSTYP" + fi +} + +# check for a chmod support +# +_require_chmod() +{ + if [ "$FSTYP" = "exfat" ]; then + _notrun "chmod is not supported on $FSTYP" + fi +} + # check for a group on the machine, fsgqa as default # _require_group()
Signature · 1 line
2.30.2
PATCH 4/5 generic/554: hide permision warning on exfat
In reply to Pavel Reichl--- tests/generic/554 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
tests/generic/554 +9 -1
@@ -46,7 +46,15 @@ $XFS_IO_PROG -f -c "pwrite -S 0x61 0 128k" $SCRATCH_MNT/file >> $seqres.full 2>& echo swap files return ETXTBUSY _format_swapfile $SCRATCH_MNT/swapfile 16m -swapon $SCRATCH_MNT/swapfile +if [ "$FSTYP" = "exfat" ]; then + # exfat does not support posix file permisions, so warning is + # to be expected + swapon $SCRATCH_MNT/swapfile 2>&1 |\ + grep -v 'insecure permission' >> $seqres.full +else + swapon $SCRATCH_MNT/swapfile +fi + $XFS_IO_PROG -f -c "copy_range -l 32k $SCRATCH_MNT/file" $SCRATCH_MNT/swapfile swapoff $SCRATCH_MNT/swapfile
Signature · 1 line
2.30.2
PATCH 2/5 g/87,88,125,126,128,193,314,317,355: Add _require_chown/chmod
In reply to Pavel Reichl--- tests/generic/087 | 1 + tests/generic/088 | 1 + tests/generic/125 | 1 + tests/generic/126 | 1 + tests/generic/128 | 1 + tests/generic/193 | 1 + tests/generic/314 | 1 + tests/generic/317 | 1 + tests/generic/355 | 1 + 9 files changed, 9 insertions(+)
tests/generic/087 +1 -0
@@ -37,6 +37,7 @@ _cleanup() # real QA test starts here _supported_fs generic _require_test +_require_chown QA_FS_PERMS=$here/src/fs_perms
tests/generic/088 +1 -0
@@ -29,6 +29,7 @@ _filter() # real QA test starts here _supported_fs generic _require_test +_require_chown path=$TEST_DIR/t_access $here/src/t_access_root $path | tee $seqres.full | _filter
tests/generic/125 +1 -0
@@ -25,6 +25,7 @@ _supported_fs generic _require_test _require_user _require_odirect +_require_chmod TESTDIR=$TEST_DIR/ftrunc TESTFILE=$TESTDIR/ftrunc.tmp
tests/generic/126 +1 -0
@@ -27,6 +27,7 @@ _cleanup() # real QA test starts here _supported_fs generic _require_test +_require_chown QA_FS_PERMS=$here/src/fs_perms
tests/generic/128 +1 -0
@@ -24,6 +24,7 @@ _supported_fs generic _require_scratch _require_user +_require_chmod _scratch_mkfs >/dev/null 2>&1 _scratch_mount "-o nosuid"
tests/generic/193 +1 -0
@@ -56,6 +56,7 @@ _supported_fs generic _require_test _require_user +_require_chown test_root=$TEST_DIR/$seq.$$.root test_user=$TEST_DIR/$seq.$$.user
tests/generic/314 +1 -0
@@ -29,6 +29,7 @@ _cleanup() _supported_fs generic _require_test _require_user +_require_chown rm -rf $TEST_DIR/$seq-dir
tests/generic/317 +1 -0
@@ -45,6 +45,7 @@ _require_scratch _require_user _require_ugid_map _require_userns +_require_chown qa_user_id=`id -u $qa_user` _filter_output()
tests/generic/355 +1 -0
@@ -32,6 +32,7 @@ _supported_fs generic _require_test _require_user _require_odirect +_require_chown testfile=$TEST_DIR/$seq.test rm -f $testfile
Signature · 1 line
2.30.2
PATCH 5/5 generic/003: Amend the test for exfat
In reply to Pavel ReichlUpdate the test so it can be run even for exfat which has 2 seconds granularity for access_time and does not have a timestamp for metadata change.
--- tests/generic/003 | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-)
tests/generic/003 +20 -9
@@ -37,6 +37,13 @@ _require_relatime rm -f $seqres.full +if [ "$FSTYP" = "exfat" ]; then + # exfat's timestamp for access_time has double seconds granularity + access_delay=2 +else + access_delay=1 +fi + _stat() { stat -c "%x;%y;%z" $1 }
@@ -79,14 +86,14 @@ echo "aaa" > $TPATH/dir1/file1 file1_stat_before_first_access=`_stat $TPATH/dir1/file1` # Accessing file1 the first time -sleep 1 +sleep $access_delay cat $TPATH/dir1/file1 > /dev/null file1_stat_after_first_access=`_stat $TPATH/dir1/file1` _compare_stat_times YNN "$file1_stat_before_first_access" \ "$file1_stat_after_first_access" "after accessing file1 first time" # Accessing file1 a second time -sleep 1 +sleep $access_delay cat $TPATH/dir1/file1 > /dev/null file1_stat_after_second_access=`_stat $TPATH/dir1/file1` _compare_stat_times NNN "$file1_stat_after_first_access" \
@@ -109,7 +116,7 @@ _compare_stat_times NYY "$dir2_stat_before_file_creation" \ # Accessing file2 file2_stat_before_first_access=`_stat $TPATH/dir2/file2` -sleep 1 +sleep $access_delay cat $TPATH/dir2/file2 > /dev/null file2_stat_after_first_access=`_stat $TPATH/dir2/file2` _compare_stat_times YNN "$file2_stat_before_first_access" \
@@ -135,11 +142,15 @@ echo "xyz" > $TPATH/dir1/file1 file1_stat_after_modify=`_stat $TPATH/dir1/file1` _compare_stat_times NYY "$file1_stat_before_modify" \ "$file1_stat_after_modify" "after modifying file1" -sleep 1 -mv $TPATH/dir1/file1 $TPATH/dir1/file1_renamed -file1_stat_after_change=`_stat $TPATH/dir1/file1_renamed` -_compare_stat_times NNY "$file1_stat_after_modify" \ - "$file1_stat_after_change" "after changing file1" + +# exfat does not support last metadata change timestamp +if [ "$FSTYP" != "exfat" ]; then + sleep 1 + mv $TPATH/dir1/file1 $TPATH/dir1/file1_renamed + file1_stat_after_change=`_stat $TPATH/dir1/file1_renamed` + _compare_stat_times NNY "$file1_stat_after_modify" \ + "$file1_stat_after_change" "after changing file1" +fi # Mounting with strictatime option and # accessing a previously created file twice
@@ -148,7 +159,7 @@ cat $TPATH/dir2/file3 > /dev/null file3_stat_after_second_access=`_stat $TPATH/dir2/file3` _compare_stat_times YNN "$file3_stat_after_first_access" \ "$file3_stat_after_second_access" "after accessing file3 second time" -sleep 1 +sleep $access_delay cat $TPATH/dir2/file3 > /dev/null file3_stat_after_third_access=`_stat $TPATH/dir2/file3` _compare_stat_times YNN "$file3_stat_after_second_access" \
Signature · 1 line
2.30.2
PATCH 3/5 common: hide permision warning from mkswap for exfat
In reply to Pavel Reichlexfat does not support posix file permisions, so warning from mkswap is inavitable. This patch hides the warning message so the test won't fail.
--- common/rc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
common/rc +7 -1
@@ -2383,7 +2383,13 @@ _format_swapfile() { # Swap files must be nocow on Btrfs. $CHATTR_PROG +C "$fname" > /dev/null 2>&1 _pwrite_byte 0x61 0 "$sz" "$fname" >> $seqres.full - $MKSWAP_PROG "$fname" >> $seqres.full + if [ "$FSTYP" = "exfat" ]; then + # exfat does not support posix file permisions, so warning is + # to be expected + $MKSWAP_PROG "$fname" 2>&1 | grep -v 'insecure permission' >> $seqres.full + else + $MKSWAP_PROG "$fname" >> $seqres.full + fi } # Check that the filesystem supports swapfiles
Signature · 1 line
2.30.2
Re: [PATCH 2/5] g/87,88,125,126,128,193,314,317,355: Add _require_chown/chmod
In reply to Pavel ReichlQuoted 11 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- tests/generic/087 | 1 + tests/generic/088 | 1 + tests/generic/125 | 1 + tests/generic/126 | 1 + tests/generic/128 | 1 + tests/generic/193 | 1 + tests/generic/314 | 1 + tests/generic/317 | 1 + tests/generic/355 | 1 +
From my testing, generic/597[1] and generic/598[2] fails on chown and chmod too.
Thanks,
Zorro
[1]
597.out.bad renamed from dev/fd/63 +1 -0
@@ -1,14 +1,24 @@ QA output created by 597 +chmod: changing permissions of '/mnt/xfstests/test/597/sticky_dir': Operation not permitted
...
[2]
598.out.bad renamed from dev/fd/63 +2 -0
@@ -1,12 +1,21 @@ QA output created by 598 +chmod: changing permissions of '/mnt/xfstests/test/598/sticky_dir': Operation not permitted +chown: changing ownership of '/mnt/xfstests/test/598/sticky_dir': Operation not permitted
...
Quoted 113 lines
9 files changed, 9 insertions(+)tests/generic/087 +1
-0@@ -37,6 +37,7 @@ _cleanup() # real QA test starts here _supported_fs generic _require_test +_require_chown QA_FS_PERMS=$here/src/fs_permstests/generic/088 +1
-0@@ -29,6 +29,7 @@ _filter() # real QA test starts here _supported_fs generic _require_test +_require_chown path=$TEST_DIR/t_access $here/src/t_access_root $path | tee $seqres.full | _filtertests/generic/125 +1
-0@@ -25,6 +25,7 @@ _supported_fs generic _require_test _require_user _require_odirect +_require_chmod TESTDIR=$TEST_DIR/ftrunc TESTFILE=$TESTDIR/ftrunc.tmptests/generic/126 +1
-0@@ -27,6 +27,7 @@ _cleanup() # real QA test starts here _supported_fs generic _require_test +_require_chown QA_FS_PERMS=$here/src/fs_permstests/generic/128 +1
-0@@ -24,6 +24,7 @@ _supported_fs generic _require_scratch _require_user +_require_chmod _scratch_mkfs >/dev/null 2>&1 _scratch_mount "-o nosuid"tests/generic/193 +1
-0@@ -56,6 +56,7 @@ _supported_fs generic _require_test _require_user +_require_chown test_root=$TEST_DIR/$seq.$$.root test_user=$TEST_DIR/$seq.$$.usertests/generic/314 +1
-0@@ -29,6 +29,7 @@ _cleanup() _supported_fs generic _require_test _require_user +_require_chown rm -rf $TEST_DIR/$seq-dirtests/generic/317 +1
-0@@ -45,6 +45,7 @@ _require_scratch _require_user _require_ugid_map _require_userns +_require_chown qa_user_id=`id -u $qa_user` _filter_output()tests/generic/355 +1
-0@@ -32,6 +32,7 @@ _supported_fs generic _require_test _require_user _require_odirect +_require_chown testfile=$TEST_DIR/$seq.test rm -f $testfileSignature · 1 line
2.30.2
Re: [PATCH 4/5] generic/554: hide permision warning on exfat
In reply to Pavel Reichltests/generic/554
Quoted 6 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- tests/generic/554 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)tests/generic/554 +0
-0
If you'd like to filter this warning, besides generic/554, generic/472 [1] and generic/495 [2] have this warning too. But g/495 has more failures. I'm wondering is that worth testing swap on exfat filesystem ...
Thanks,
Zorro
[1]
472.out.bad renamed from dev/fd/63 +1 -0
@@ -1,4 +1,5 @@ QA output created by 472 +mkswap: /mnt/xfstests/scratch/swap: insecure permissions 0755, 0600 suggested.
...
[2]
495.out.bad renamed from dev/fd/63 +1 -1
@@ -1,5 +1,5 @@ QA output created by 495 +mkswap: /mnt/xfstests/scratch/swap: insecure permissions 0755, 0600 suggested. File with holes -swapon: Invalid argument
...
Quoted 23 lines
index
fa4f97d2..365628e2100755tests/generic/554 +9
-1@@ -46,7 +46,15 @@ $XFS_IO_PROG -f -c "pwrite -S 0x61 0 128k" $SCRATCH_MNT/file >> $seqres.full 2>& echo swap files return ETXTBUSY _format_swapfile $SCRATCH_MNT/swapfile 16m -swapon $SCRATCH_MNT/swapfile +if [ "$FSTYP" = "exfat" ]; then + # exfat does not support posix file permisions, so warning is + # to be expected + swapon $SCRATCH_MNT/swapfile 2>&1 |\ + grep -v 'insecure permission' >> $seqres.full +else + swapon $SCRATCH_MNT/swapfile +fi + $XFS_IO_PROG -f -c "copy_range -l 32k $SCRATCH_MNT/file" $SCRATCH_MNT/swapfile swapoff $SCRATCH_MNT/swapfileSignature · 1 line
2.30.2
Re: [PATCH 4/5] generic/554: hide permision warning on exfat
Quoted 10 lines · Zorro Lang
tests/generic/554
Quoted 6 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- tests/generic/554 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)tests/generic/554 +0
-0If you'd like to filter this warning, besides generic/554, generic/472 [1] and generic/495 [2] have this warning too. But g/495 has more failures. I'm wondering
Oh, sorry, I read this patch before [PATCH 3/5]. Ignore this suggestion about g/472 and g/495.
Quoted 46 lines
is that worth testing swap on exfat filesystem ...
Thanks,
Zorro[1]
472.out.bad renamed from dev/fd/63 +1
-0@@ -1,4 +1,5 @@ QA output created by 472 +mkswap: /mnt/xfstests/scratch/swap: insecure permissions 0755, 0600 suggested.[2]
495.out.bad renamed from dev/fd/63 +1
-1@@ -1,5 +1,5 @@ QA output created by 495 +mkswap: /mnt/xfstests/scratch/swap: insecure permissions 0755, 0600 suggested. File with holes -swapon: Invalid argumentQuoted 24 lines
index
fa4f97d2..365628e2100755tests/generic/554 +9
-1@@ -46,7 +46,15 @@ $XFS_IO_PROG -f -c "pwrite -S 0x61 0 128k" $SCRATCH_MNT/file >> $seqres.full 2>& echo swap files return ETXTBUSY _format_swapfile $SCRATCH_MNT/swapfile 16m -swapon $SCRATCH_MNT/swapfile +if [ "$FSTYP" = "exfat" ]; then + # exfat does not support posix file permisions, so warning is + # to be expected + swapon $SCRATCH_MNT/swapfile 2>&1 |\ + grep -v 'insecure permission' >> $seqres.full +else + swapon $SCRATCH_MNT/swapfile +fi + $XFS_IO_PROG -f -c "copy_range -l 32k $SCRATCH_MNT/file" $SCRATCH_MNT/swapfile swapoff $SCRATCH_MNT/swapfileSignature · 1 line
2.30.2
Re: [PATCH 1/5] common: Add _require_{chown,chmod}()
In reply to Pavel ReichlQuoted 4 lines · Pavel Reichl
Add helper function that ensures that test is only executed on file systems that implement chown and chmod.
Signed-off-by Pavel Reichl <[email protected]>
I think patch 1 and patch 2 could be folded into one patch, introduce new helpers and use them in the same patch.
Thanks,
Eryu
Quoted 35 lines
--- common/rc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)common/rc +18
-0@@ -2129,6 +2129,24 @@ _require_user() [ "$?" == "0" ] || _notrun "$qa_user cannot execute commands." } +# check for a chown support +# +_require_chown() +{ + if [ "$FSTYP" = "exfat" ]; then + _notrun "chown is not supported on $FSTYP" + fi +} + +# check for a chmod support +# +_require_chmod() +{ + if [ "$FSTYP" = "exfat" ]; then + _notrun "chmod is not supported on $FSTYP" + fi +} + # check for a group on the machine, fsgqa as default # _require_group()Signature · 1 line
2.30.2
Re: [PATCH 4/5] generic/554: hide permision warning on exfat
In reply to Pavel ReichlQuoted 12 lines · Pavel Reichl
Signed-off-by Pavel Reichl <[email protected]>--- tests/generic/554 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)tests/generic/554 +0
-0@@ -46,7 +46,15 @@ $XFS_IO_PROG -f -c "pwrite -S 0x61 0 128k" $SCRATCH_MNT/file >> $seqres.full 2>& echo swap files return ETXTBUSY
tests/generic/554 $XFS_IO_PROG -f -c "pwrite -S 0x61 0 128k" $SCRATCH_MNT/file >> $seqres.full 2>& · line 56
Quoted 10 lines
tests/generic/554 +8
-1_format_swapfile $SCRATCH_MNT/swapfile 16m -swapon $SCRATCH_MNT/swapfile +if [ "$FSTYP" = "exfat" ]; then + # exfat does not support posix file permisions, so warning is + # to be expected + swapon $SCRATCH_MNT/swapfile 2>&1 |\ + grep -v 'insecure permission' >> $seqres.full +else + swapon $SCRATCH_MNT/swapfile +fi
Introduce a new helper like _format_swapfile and do the check there?
Thanks,
Eryu
Quoted 6 lines
tests/generic/554 +1
-0+ $XFS_IO_PROG -f -c "copy_range -l 32k $SCRATCH_MNT/file" $SCRATCH_MNT/swapfile swapoff $SCRATCH_MNT/swapfileSignature · 1 line
2.30.2