ZTS: Fix in-tree dbufstats test case

Commit a887d65 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 <[email protected]> Reviewed-by: Ryan Moeller <[email protected]> Reviewed-by: Michael Niewöhner <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #9118 Closes #9196
openzfs · Aug 23, 2019 · 4302698 · 4302698
1 parent d1d1f8c
commit 4302698
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
@@ -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]
@@ -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']
 

diff --git a/tests/zfs-tests/tests/functional/arc/Makefile.am b/tests/zfs-tests/tests/functional/arc/Makefile.am
@@ -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
diff --git a/...tional/cli_user/misc/dbufstat_001_pos.ksh → ...ests/functional/arc/dbufstats_003_pos.ksh b/...tional/cli_user/misc/dbufstat_001_pos.ksh → ...ests/functional/arc/dbufstats_003_pos.ksh
@@ -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"
diff --git a/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am b/tests/zfs-tests/tests/functional/cli_user/misc/Makefile.am
@@ -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