Some filesystems (e.g. UBIFS) fail with EPERM when trying to move a file into an encrypted directory via cross rename, without having access to the encryption key. Since rename is perfectly allowed to return EPERM, which is also tested for, and no precise specification seems to exist that clarifys when to expect EPERM and when ENOKEY, this patch modifies the generic/398 test to accept both, for the test case where the key is not available. Signed-off-by: David Oberhollenzer <david.oberhollenzer@xxxxxxxxxxxxx> --- tests/generic/398 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/generic/398 b/tests/generic/398 index b486b9c5..390c4380 100755 --- a/tests/generic/398 +++ b/tests/generic/398 @@ -43,6 +43,12 @@ _cleanup() rm -f $tmp.* } +_filter_rename() +{ + # rename without key can also fail with EPERM instead of ENOKEY + sed -e "s/Operation not permitted/Required key not available/g" +} + # get standard environment, filters and checks . ./common/rc . ./common/filter @@ -149,9 +155,9 @@ efile1=$(find $edir1 -type f) efile2=$(find $edir2 -type f) echo -e "\n\n*** Exchange encrypted <=> encrypted without key ***" -src/renameat2 -x $efile1 $efile2 +src/renameat2 -x $efile1 $efile2 |& _filter_rename echo -e "\n*** Exchange encrypted <=> unencrypted without key ***" -src/renameat2 -x $efile1 $udir/ufile +src/renameat2 -x $efile1 $udir/ufile |& _filter_rename # success, all done status=0 -- 2.12.0 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html