Skip to content

Commit e4c4390

Browse files
Ryan Moellerbehlendorf
Ryan Moeller
authored and
behlendorf
committed
ZTS: Move more tests out of common.run
These tests won't run on all platforms as currently implemented: * add_nested_replacing_spare (needs zed) * fault (needs zed) * mmp (needs multihost_history) * umount_unlink_drained (needs procfs) * zpool_expand (needs udev events and zed) * zpool_reopen (needs scsi_debug) * zvol_swap_003_pos (needs to modify vfstab) * zvol_swap_00[56]_pos (needs swaphigh/swaplen) Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ryan Moeller <[email protected]> Closes #9871
1 parent a340316 commit e4c4390

File tree

8 files changed

+39
-44
lines changed

8 files changed

+39
-44
lines changed

‎tests/runfiles/common.run

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ tags = ['functional', 'cli_root', 'zpool']
290290
tests = ['zpool_add_001_pos', 'zpool_add_002_pos', 'zpool_add_003_pos',
291291
'zpool_add_004_pos', 'zpool_add_006_pos', 'zpool_add_007_neg',
292292
'zpool_add_008_neg', 'zpool_add_009_neg', 'zpool_add_010_pos',
293-
'add-o_ashift', 'add_prop_ashift', 'add_nested_replacing_spare']
293+
'add-o_ashift', 'add_prop_ashift']
294294
tags = ['functional', 'cli_root', 'zpool_add']
295295

296296
[tests/functional/cli_root/zpool_attach]
@@ -329,11 +329,6 @@ tags = ['functional', 'cli_root', 'zpool_destroy']
329329
tests = ['zpool_detach_001_neg']
330330
tags = ['functional', 'cli_root', 'zpool_detach']
331331

332-
[tests/functional/cli_root/zpool_expand]
333-
tests = ['zpool_expand_001_pos', 'zpool_expand_002_pos',
334-
'zpool_expand_003_neg', 'zpool_expand_004_pos', 'zpool_expand_005_pos']
335-
tags = ['functional', 'cli_root', 'zpool_expand']
336-
337332
[tests/functional/cli_root/zpool_export]
338333
tests = ['zpool_export_001_pos', 'zpool_export_002_pos',
339334
'zpool_export_003_neg', 'zpool_export_004_pos']
@@ -409,12 +404,6 @@ tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos',
409404
'zpool_remove_003_pos']
410405
tags = ['functional', 'cli_root', 'zpool_remove']
411406

412-
[tests/functional/cli_root/zpool_reopen]
413-
tests = ['zpool_reopen_001_pos', 'zpool_reopen_002_pos',
414-
'zpool_reopen_003_pos', 'zpool_reopen_004_pos', 'zpool_reopen_005_pos',
415-
'zpool_reopen_006_neg', 'zpool_reopen_007_pos']
416-
tags = ['functional', 'cli_root', 'zpool_reopen']
417-
418407
[tests/functional/cli_root/zpool_replace]
419408
tests = ['zpool_replace_001_neg', 'replace-o_ashift', 'replace_prop_ashift']
420409
tags = ['functional', 'cli_root', 'zpool_replace']
@@ -551,12 +540,6 @@ tags = ['functional', 'delegate']
551540
tests = ['exec_001_pos', 'exec_002_neg']
552541
tags = ['functional', 'exec']
553542

554-
[tests/functional/fault]
555-
tests = ['auto_offline_001_pos', 'auto_online_001_pos', 'auto_replace_001_pos',
556-
'auto_spare_001_pos', 'auto_spare_002_pos', 'auto_spare_multiple',
557-
'auto_spare_shared', 'decrypt_fault', 'decompress_fault']
558-
tags = ['functional', 'fault']
559-
560543
[tests/functional/features/async_destroy]
561544
tests = ['async_destroy_001_pos']
562545
tags = ['functional', 'features', 'async_destroy']
@@ -627,15 +610,8 @@ tags = ['functional', 'migration']
627610
tests = ['mmap_write_001_pos', 'mmap_read_001_pos']
628611
tags = ['functional', 'mmap']
629612

630-
[tests/functional/mmp]
631-
tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval',
632-
'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
633-
'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history',
634-
'mmp_on_zdb', 'mmp_write_distribution', 'mmp_hostid']
635-
tags = ['functional', 'mmp']
636-
637613
[tests/functional/mount]
638-
tests = ['umount_001', 'umount_unlinked_drain', 'umountall_001']
614+
tests = ['umount_001', 'umountall_001']
639615
tags = ['functional', 'mount']
640616

641617
[tests/functional/mv_files]
@@ -888,8 +864,7 @@ tests = ['zvol_misc_002_pos', 'zvol_misc_hierarchy', 'zvol_misc_rename_inuse',
888864
tags = ['functional', 'zvol', 'zvol_misc']
889865

890866
[tests/functional/zvol/zvol_swap]
891-
tests = ['zvol_swap_001_pos', 'zvol_swap_002_pos', 'zvol_swap_003_pos',
892-
'zvol_swap_004_pos', 'zvol_swap_005_pos', 'zvol_swap_006_pos']
867+
tests = ['zvol_swap_001_pos', 'zvol_swap_002_pos', 'zvol_swap_004_pos']
893868
tags = ['functional', 'zvol', 'zvol_swap']
894869

895870
[tests/functional/libzfs]

‎tests/runfiles/linux.run

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,26 @@ tests = ['zfeature_set_unsupported', 'zfs_get_unsupported',
5555
'zpool_set_unsupported']
5656
tags = ['functional', 'cli_root', 'zfs_sysfs']
5757

58+
[tests/functional/cli_root/zpool_add:Linux]
59+
tests = ['add_nested_replacing_spare']
60+
tags = ['functional', 'cli_root', 'zpool_add']
61+
5862
[tests/functional/cli_root/zpool_events:Linux]
5963
tests = ['zpool_events_clear', 'zpool_events_cliargs', 'zpool_events_follow',
6064
'zpool_events_poolname', 'zpool_events_errors']
6165
tags = ['functional', 'cli_root', 'zpool_events']
6266

67+
[tests/functional/cli_root/zpool_expand:Linux]
68+
tests = ['zpool_expand_001_pos', 'zpool_expand_002_pos',
69+
'zpool_expand_003_neg', 'zpool_expand_004_pos', 'zpool_expand_005_pos']
70+
tags = ['functional', 'cli_root', 'zpool_expand']
71+
72+
[tests/functional/cli_root/zpool_reopen:Linux]
73+
tests = ['zpool_reopen_001_pos', 'zpool_reopen_002_pos',
74+
'zpool_reopen_003_pos', 'zpool_reopen_004_pos', 'zpool_reopen_005_pos',
75+
'zpool_reopen_006_neg', 'zpool_reopen_007_pos']
76+
tags = ['functional', 'cli_root', 'zpool_reopen']
77+
6378
[tests/functional/compression:Linux]
6479
tests = ['compress_004_pos']
6580
tags = ['functional', 'compression']
@@ -79,7 +94,10 @@ tests = ['events_001_pos', 'events_002_pos', 'zed_rc_filter']
7994
tags = ['functional', 'events']
8095

8196
[tests/functional/fault:Linux]
82-
tests = ['auto_spare_ashift', 'scrub_after_resilver', 'zpool_status_-s']
97+
tests = ['auto_offline_001_pos', 'auto_online_001_pos', 'auto_replace_001_pos',
98+
'auto_spare_001_pos', 'auto_spare_002_pos', 'auto_spare_multiple',
99+
'auto_spare_ashift', 'auto_spare_shared', 'decrypt_fault',
100+
'decompress_fault', 'scrub_after_resilver', 'zpool_status_-s']
83101
tags = ['functional', 'fault']
84102

85103
[tests/functional/features/large_dnode:Linux]
@@ -94,6 +112,17 @@ tags = ['functional', 'io']
94112
tests = ['mmap_libaio_001_pos']
95113
tags = ['functional', 'mmap']
96114

115+
[tests/functional/mmp:Linux]
116+
tests = ['mmp_on_thread', 'mmp_on_uberblocks', 'mmp_on_off', 'mmp_interval',
117+
'mmp_active_import', 'mmp_inactive_import', 'mmp_exported_import',
118+
'mmp_write_uberblocks', 'mmp_reset_interval', 'multihost_history',
119+
'mmp_on_zdb', 'mmp_write_distribution', 'mmp_hostid']
120+
tags = ['functional', 'mmp']
121+
122+
[tests/functional/mount:Linux]
123+
tests = ['umount_unlinked_drain']
124+
tags = ['functional', 'mount']
125+
97126
[tests/functional/procfs:Linux]
98127
tests = ['procfs_list_basic', 'procfs_list_concurrent_readers',
99128
'procfs_list_stale_read', 'pool_state']

‎tests/runfiles/sunos.run

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,7 @@ tags = ['functional', 'xattr']
4141
tests = ['zvol_misc_001_neg', 'zvol_misc_003_neg', 'zvol_misc_004_pos',
4242
'zvol_misc_005_neg', 'zvol_misc_006_pos']
4343
tags = ['functional', 'zvol', 'zvol_misc']
44+
45+
[tests/functional/zvol/zvol_swap:illumos]
46+
tests = ['zvol_swap_003_pos', 'zvol_swap_005_pos', 'zvol_swap_006_pos']
47+
tags = ['functional', 'zvol', 'zvol_swap']

‎tests/test-runner/bin/zts-report.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,6 @@
162162
'rootpool/setup': ['SKIP', na_reason],
163163
'rsend/rsend_008_pos': ['SKIP', '6066'],
164164
'vdev_zaps/vdev_zaps_007_pos': ['FAIL', known_reason],
165-
'zvol/zvol_swap/zvol_swap_003_pos': ['SKIP', na_reason],
166-
'zvol/zvol_swap/zvol_swap_005_pos': ['SKIP', na_reason],
167-
'zvol/zvol_swap/zvol_swap_006_pos': ['SKIP', na_reason],
168165
}
169166

170167
#

‎tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_002_pos.ksh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ function cleanup
5656

5757
log_assert "Using a zvol as swap space, fill /var/tmp to 80%."
5858

59+
log_onexit cleanup
60+
5961
vol=$TESTPOOL/$TESTVOL
6062
swapdev=${ZVOL_DEVDIR}/$vol
6163
log_must swap_setup $swapdev

‎tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_003_pos.ksh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646

4747
verify_runnable "global"
4848

49-
if is_linux || is_freebsd; then
50-
log_unsupported "Modifies global non-ZFS system config"
51-
fi
52-
5349
function cleanup
5450
{
5551
[[ -f $TESTDIR/$TESTFILE ]] && log_must rm -f $TESTDIR/$TESTFILE

‎tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_005_pos.ksh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444

4545
verify_runnable "global"
4646

47-
if is_linux || is_freebsd; then
48-
log_unsupported "swaplow + swaplen unsupported Linux/FreeBSD options"
49-
fi
50-
5147
assertion="Verify the sum of swaplow and swaplen is less or equal to volsize"
5248
log_assert $assertion
5349

‎tests/zfs-tests/tests/functional/zvol/zvol_swap/zvol_swap_006_pos.ksh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545

4646
verify_runnable "global"
4747

48-
if is_linux || is_freebsd; then
49-
log_unsupported "swaplow + swaplen unsupported Linux/FreeBSD options"
50-
fi
51-
5248
function cleanup
5349
{
5450
typeset -i i=0

0 commit comments

Comments
 (0)