From cdae59e1530061cf4caa549a062994161c4383c6 Mon Sep 17 00:00:00 2001 From: Seth Troisi Date: Mon, 22 Apr 2024 10:47:44 -0700 Subject: [PATCH] ZTS: user_namespace_004.ksh avoid error in cleanup if unsupported Reviewed-by: Brian Behlendorf Signed-off-by: Seth Troisi Closes #16114 --- .../tests/functional/user_namespace/user_namespace_004.ksh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh b/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh index 37ef84b72377..e6ad25f23f93 100755 --- a/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh +++ b/tests/zfs-tests/tests/functional/user_namespace/user_namespace_004.ksh @@ -44,8 +44,6 @@ user_ns_cleanup() { log_must zfs destroy -r "$TESTPOOL/userns" } -log_onexit user_ns_cleanup - log_assert "Check zfs zone command handling of non-namespace files" # Pass if user namespaces are not supported. @@ -54,6 +52,8 @@ if [ "$?" -ne "0" ]; then log_unsupported "Failed to create user namespace" fi +log_onexit user_ns_cleanup + # Create the baseline datasets. log_must zfs create -o zoned=on "$TESTPOOL/userns"