From 29e05d5345d456e4434a6ffc16483a0fc0ba0cbd Mon Sep 17 00:00:00 2001 From: Tony Hutter Date: Fri, 17 Dec 2021 12:37:21 -0800 Subject: [PATCH] ZTS: Fix zpool_reopen_[1-5] on Fedora 35 The zpool_reopen_[1-5] tests are failing Fedora 35 with: zpool_reopen_001_pos.ksh[64]: log_must[67]: log_pos[270]: wait_for_resilver_end[98]: wait_for_action: line 71: func: is read only Renaming 'func' -> 'funct' fixes the issue. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Tony Hutter Closes #12871 --- .../tests/functional/cli_root/zpool_reopen/zpool_reopen.shlib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.shlib b/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.shlib index 075ad85e9f..3d142fdf70 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.shlib +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_reopen/zpool_reopen.shlib @@ -68,11 +68,11 @@ function wait_for_action #pool timeout function { typeset pool=$1 typeset -i timeout=$2 - typeset func=$3 + typeset funct=$3 while [ $timeout -gt 0 ]; do (( --timeout )) - if ( $func $pool ); then + if ( $funct $pool ); then return 0 fi sleep 1