Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZTS: Fix in-tree dbufstats test case #9196

Merged
merged 1 commit into from
Aug 23, 2019
Merged

ZTS: Fix in-tree dbufstats test case #9196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/runfiles/linux.run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
tags = ['functional', 'alloc_class']

[tests/functional/arc]
tests = ['dbufstats_001_pos', 'dbufstats_002_pos']
tests = ['dbufstats_001_pos', 'dbufstats_002_pos', 'dbufstats_003_pos']
tags = ['functional', 'arc']

[tests/functional/atime]
Expand Down Expand Up @@ -503,7 +503,7 @@ tests = ['zdb_001_neg', 'zfs_001_neg', 'zfs_allow_001_neg',
'zpool_offline_001_neg', 'zpool_online_001_neg', 'zpool_remove_001_neg',
'zpool_replace_001_neg', 'zpool_scrub_001_neg', 'zpool_set_001_neg',
'zpool_status_001_neg', 'zpool_upgrade_001_neg', 'arcstat_001_pos',
'arc_summary_001_pos', 'arc_summary_002_neg', 'dbufstat_001_pos']
'arc_summary_001_pos', 'arc_summary_002_neg']
user =
tags = ['functional', 'cli_user', 'misc']

Expand Down
3 changes: 2 additions & 1 deletion tests/zfs-tests/tests/functional/arc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ dist_pkgdata_SCRIPTS = \
cleanup.ksh \
setup.ksh \
dbufstats_001_pos.ksh \
dbufstats_002_pos.ksh
dbufstats_002_pos.ksh \
dbufstats_003_pos.ksh
4 changes: 2 additions & 2 deletions ...tional/cli_user/misc/dbufstat_001_pos.ksh → ...ests/functional/arc/dbufstats_003_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ log_assert "dbufstat generates output and doesn't return an error code"

typeset -i i=0
while [[ $i -lt ${#args[*]} ]]; do
log_must eval "sudo dbufstat ${args[i]} > /dev/null"
log_must eval "dbufstat ${args[i]} >/dev/null"
((i = i + 1))
done

# A simple test of dbufstat filter functionality
log_must eval "sudo dbufstat -F object=10,dbc=1,pool=$TESTPOOL > /dev/null"
log_must eval "dbufstat -F object=10,dbc=1,pool=$TESTPOOL >/dev/null"

log_pass "dbufstat generates output and doesn't return an error code"
3 changes: 1 addition & 2 deletions tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ dist_pkgdata_SCRIPTS = \
zpool_upgrade_001_neg.ksh \
arcstat_001_pos.ksh \
arc_summary_001_pos.ksh \
arc_summary_002_neg.ksh \
dbufstat_001_pos.ksh
arc_summary_002_neg.ksh

dist_pkgdata_DATA = \
misc.cfg