From: Eric Biggers <ebiggers@xxxxxxxxxx>
Some of the newer verity tests don't work properly on systems where
fs.verity.require_signatures is enabled, either because they forget to
disable it at the beginning of the test, or they forget to re-enable it
afterwards, or both. Fix this.
Reviewed-by: Andrey Albershteyn <aalbersh@xxxxxxxxxx>
Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
---
tests/btrfs/290 | 9 +++++++++
tests/btrfs/291 | 2 ++
tests/generic/624 | 8 ++++++++
tests/generic/692 | 8 ++++++++
4 files changed, 27 insertions(+)
diff --git a/tests/btrfs/290 b/tests/btrfs/290
index b7254c5e..06a58f47 100755
--- a/tests/btrfs/290
+++ b/tests/btrfs/290
@@ -15,6 +15,14 @@ _begin_fstest auto quick verity
. ./common/filter
. ./common/verity
+# Override the default cleanup function.
+_cleanup()
+{
+ cd /
+ _restore_fsverity_signatures
+ rm -f $tmp.*
+}
+
# real QA test starts here
_supported_fs btrfs
_require_scratch_verity
@@ -24,6 +32,7 @@ _require_xfs_io_command "falloc"
_require_xfs_io_command "pread"
_require_xfs_io_command "pwrite"
_require_btrfs_corrupt_block
+_disable_fsverity_signatures
get_ino() {
local file=$1
diff --git a/tests/btrfs/291 b/tests/btrfs/291
index bbdd183d..c5947133 100755
--- a/tests/btrfs/291
+++ b/tests/btrfs/291
@@ -23,6 +23,7 @@ _cleanup()
rm -f $img
$LVM_PROG vgremove -f -y $vgname >>$seqres.full 2>&1
losetup -d $loop_dev >>$seqres.full 2>&1
+ _restore_fsverity_signatures
}
# Import common functions.
@@ -43,6 +44,7 @@ _require_command $LVM_PROG lvm
_require_scratch_verity
_require_btrfs_command inspect-internal dump-tree
_require_test_program "log-writes/replay-log"
+_disable_fsverity_signatures
sync_loop() {
i=$1
diff --git a/tests/generic/624 b/tests/generic/624
index 89fbf256..7c447289 100755
--- a/tests/generic/624
+++ b/tests/generic/624
@@ -10,6 +10,14 @@
. ./common/preamble
_begin_fstest auto quick verity
+# Override the default cleanup function.
+_cleanup()
+{
+ cd /
+ _restore_fsverity_signatures
+ rm -f $tmp.*
+}
+
. ./common/filter
. ./common/verity
diff --git a/tests/generic/692 b/tests/generic/692
index 0bb1fd33..d6da734b 100644
--- a/tests/generic/692
+++ b/tests/generic/692
@@ -15,6 +15,13 @@
. ./common/preamble
_begin_fstest auto quick verity
+# Override the default cleanup function.
+_cleanup()
+{
+ cd /
+ _restore_fsverity_signatures
+ rm -f $tmp.*
+}
# Import common functions.
. ./common/filter
@@ -26,6 +33,7 @@ _require_test
_require_math
_require_scratch_verity
_require_fsverity_max_file_size_limit
+_disable_fsverity_signatures
_scratch_mkfs_verity &>> $seqres.full
_scratch_mount
--
2.38.1
