Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: Fix in-tree dbufstats test case 

Commit a887d653 updated the dbufstats such that escalated privileges
are required.  Since all tests under cli_user are run with normal
privileges move this test case to a location where it will be run
required privileges.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9118 
Closes #9196
This commit is contained in:
Brian Behlendorf 2019-08-22 17:37:48 -07:00 committed by GitHub
parent d1d1f8c37d
commit 4302698be1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/runfiles/linux.run
View File

@ -33,7 +33,7 @@ tests = ['alloc_class_001_pos', 'alloc_class_002_neg', 'alloc_class_003_pos',
tags = ['functional', 'alloc_class'] tags = ['functional', 'alloc_class']
[tests/functional/arc] [tests/functional/arc]
tests = ['dbufstats_001_pos', 'dbufstats_002_pos'] tests = ['dbufstats_001_pos', 'dbufstats_002_pos', 'dbufstats_003_pos']
tags = ['functional', 'arc'] tags = ['functional', 'arc']
[tests/functional/atime] [tests/functional/atime]
@ -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_offline_001_neg', 'zpool_online_001_neg', 'zpool_remove_001_neg',
'zpool_replace_001_neg', 'zpool_scrub_001_neg', 'zpool_set_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', '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 = user =
tags = ['functional', 'cli_user', 'misc'] tags = ['functional', 'cli_user', 'misc']

3
tests/zfs-tests/tests/functional/arc/Makefile.am
View File

@ -3,4 +3,5 @@ dist_pkgdata_SCRIPTS = \
cleanup.ksh \ cleanup.ksh \
setup.ksh \ setup.ksh \
dbufstats_001_pos.ksh \ dbufstats_001_pos.ksh \
dbufstats_002_pos.ksh dbufstats_002_pos.ksh \
dbufstats_003_pos.ksh

4
tests/zfs-tests/tests/functional/cli_user/misc/dbufstat_001_pos.ksh → tests/zfs-tests/tests/functional/arc/dbufstats_003_pos.ksh
View File

@ -33,11 +33,11 @@ log_assert "dbufstat generates output and doesn't return an error code"
typeset -i i=0 typeset -i i=0
while [[ $i -lt ${#args[*]} ]]; do 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)) ((i = i + 1))
done done
# A simple test of dbufstat filter functionality # 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" log_pass "dbufstat generates output and doesn't return an error code"

3
tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am
View File

@ -45,8 +45,7 @@ dist_pkgdata_SCRIPTS = \
zpool_upgrade_001_neg.ksh \ zpool_upgrade_001_neg.ksh \
arcstat_001_pos.ksh \ arcstat_001_pos.ksh \
arc_summary_001_pos.ksh \ arc_summary_001_pos.ksh \
arc_summary_002_neg.ksh \ arc_summary_002_neg.ksh
dbufstat_001_pos.ksh
dist_pkgdata_DATA = \ dist_pkgdata_DATA = \
misc.cfg misc.cfg