Some tests on ceph require changing the layout of new files, which is
forbidden when the files are encrypted. Add a test that touches a file
in $TEST_DIR and then tests it to see if it reports the
STATX_ATTR_ENCRYPTED flag, and does a _notrun if it's present.
Also add this requirement to three ceph tests that change the layout.
Cc: Luis Henriques <lhenriques@xxxxxxx>
Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
---
common/encrypt | 18 ++++++++++++++++++
tests/ceph/001 | 2 ++
tests/ceph/002 | 2 ++
tests/ceph/003 | 2 ++
4 files changed, 24 insertions(+)
v2: make ceph/001 also call _require_not_encrypted
v3: move test into common/encrypt
diff --git a/common/encrypt b/common/encrypt
index f90c4ef05a3f..156425af40a8 100644
--- a/common/encrypt
+++ b/common/encrypt
@@ -940,3 +940,21 @@ _filter_nokey_filenames()
# of characters that have ever been used in such names.
sed "s|${dir}${dir:+/}[A-Za-z0-9+,_-]\+|${dir}${dir:+/}NOKEY_NAME|g"
}
+
+# Some tests require that encryption not be enabled.
+_require_not_encrypted()
+{
+ local target=$TEST_DIR/require_not_encrypted.$$
+ local ret=0
+
+ #
+ # The top-level directory mounted with test_dummy_encryption is not
+ # itself encrypted. Only new files and directories created under it
+ # are.
+ touch $target
+ local attrs=$($XFS_IO_PROG -c 'statx -r' $target | awk '/stat.attributes / { print $3 }')
+ rm -f $target
+
+ # STATX_ATTR_ENCRYPTED == 0x800
+ [ $(( attrs & 0x800 )) -eq 0 ] || _notrun "Filesystem is encrypted"
+}
diff --git a/tests/ceph/001 b/tests/ceph/001
index c00de308fd95..d6ded026a6dd 100755
--- a/tests/ceph/001
+++ b/tests/ceph/001
@@ -17,11 +17,13 @@ _begin_fstest auto quick copy_range
. common/filter
. common/attr
. common/reflink
+. common/encrypt
# real QA test starts here
_supported_fs ceph
_require_xfs_io_command "copy_range"
+_require_not_encrypted
_require_attrs
_require_test
diff --git a/tests/ceph/002 b/tests/ceph/002
index 9bc728fd2e18..2232b75e6dfa 100755
--- a/tests/ceph/002
+++ b/tests/ceph/002
@@ -25,11 +25,13 @@ _begin_fstest auto quick copy_range
# get standard environment
. common/filter
. common/attr
+. common/encrypt
# real QA test starts here
_supported_fs ceph
_require_xfs_io_command "copy_range"
+_require_not_encrypted
_require_attrs
_require_test
diff --git a/tests/ceph/003 b/tests/ceph/003
index faedb48cfeea..aa130ae807f9 100755
--- a/tests/ceph/003
+++ b/tests/ceph/003
@@ -13,11 +13,13 @@ _begin_fstest auto quick copy_range
. common/filter
. common/attr
. common/reflink
+. common/encrypt
# real QA test starts here
_supported_fs ceph
_require_xfs_io_command "copy_range"
+_require_not_encrypted
_require_attrs
_require_test
--
2.33.1
