From eecd3f1a2184282a389440f102f756aab900da47 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 17 Dec 2021 12:40:34 -0800 Subject: [PATCH] ZTS: alloc_class.ksh must wait for the process to exit The alloc_class_* tests may fail on Linux with an EBUSY error if `zfs destroy` is run before the `dd` process has had a chance to terminate. Wait on the pid after the `kill -9` to make sure. When testing I didn't observe any failures for the alloc_class tests. Remove them from the exceptions list, the CI was used to verify the tests pass on all platforms. Reviewed-by: John Kennedy Reviewed-by: Rich Ercolani Signed-off-by: Brian Behlendorf Closes #12873 --- tests/test-runner/bin/zts-report.py.in | 5 ----- .../tests/functional/alloc_class/alloc_class.kshlib | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index e14472e2f4..da22ae7be0 100755 --- a/tests/test-runner/bin/zts-report.py.in +++ b/tests/test-runner/bin/zts-report.py.in @@ -289,11 +289,6 @@ if sys.platform.startswith('freebsd'): }) elif sys.platform.startswith('linux'): maybe.update({ - 'alloc_class/alloc_class_009_pos': ['FAIL', known_reason], - 'alloc_class/alloc_class_010_pos': ['FAIL', known_reason], - 'alloc_class/alloc_class_011_neg': ['FAIL', known_reason], - 'alloc_class/alloc_class_012_pos': ['FAIL', known_reason], - 'alloc_class/alloc_class_013_pos': ['FAIL', '11888'], 'cli_root/zfs_rename/zfs_rename_002_pos': ['FAIL', known_reason], 'cli_root/zpool_expand/zpool_expand_001_pos': ['FAIL', known_reason], 'cli_root/zpool_expand/zpool_expand_005_pos': ['FAIL', known_reason], diff --git a/tests/zfs-tests/tests/functional/alloc_class/alloc_class.kshlib b/tests/zfs-tests/tests/functional/alloc_class/alloc_class.kshlib index 4c64cff696..e204f43b3b 100644 --- a/tests/zfs-tests/tests/functional/alloc_class/alloc_class.kshlib +++ b/tests/zfs-tests/tests/functional/alloc_class/alloc_class.kshlib @@ -62,6 +62,7 @@ function display_status ((ret |= $?)) kill -9 $pid + wait $pid 2> /dev/null return $ret }