From ea45f28c8c975b72c381dc3f5d4121ef774540ab Mon Sep 17 00:00:00 2001 From: Rich Ercolani Date: Sun, 30 May 2021 13:59:16 -0400 Subject: [PATCH] Quick fixes for two ZTS failures On FreeBSD 14, these two tests started erroring out like the objects they're attempting to expect don't exist. Signed-off-by: Rich Ercolani --- tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh | 1 + tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh index eeff6575f0f4..56a688af30b4 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_checksum.ksh @@ -50,6 +50,7 @@ listing=$(ls -i $init_data) set -A array $listing obj=${array[0]} log_note "file $init_data has object number $obj" +zpool sync $TESTPOOL output=$(zdb -ddddddbbbbbb $TESTPOOL/$TESTFS $obj 2> /dev/null \ |grep -m 1 "L0 DVA" |head -n1) diff --git a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh index f0c1076c97bd..76ec30bdf588 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zdb/zdb_objset_id.ksh @@ -57,6 +57,7 @@ listing=$(ls -i $init_data) set -A array $listing obj=${array[0]} log_note "file $init_data has object number $obj" +zpool sync $TESTPOOL output=$(zdb -d $TESTPOOL/$TESTFS) objset_id=$(echo $output | awk '{split($0,array,",")} END{print array[2]}' |