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

diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index f0e468a689fbdd9f6637665f028347e8c2025d2f..848c19e3ecdda9ed67c8b84539910aa8577d53ac 100644 (file)
--- 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
index dc57ebc86275da7c5e67d8497d7fe879f3f60859..22704fa5181ff1771185a139b82ef5f473fa278c 100644 (file)
--- 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/tests/zfs-tests/tests/functional/cli_user/misc/dbufstat_001_pos.ksh b/tests/zfs-tests/tests/functional/arc/dbufstats_003_pos.ksh
similarity index 90%
rename from tests/zfs-tests/tests/functional/cli_user/misc/dbufstat_001_pos.ksh
rename to tests/zfs-tests/tests/functional/arc/dbufstats_003_pos.ksh
index 0e187015f8d6a1bac47f6b8e7a10b88ed915de78..91cec74881a6e1f584141b7f7c96b5636518f744 100755 (executable)
--- a/tests/zfs-tests/tests/functional/cli_user/misc/dbufstat_001_pos.ksh
+++ b/tests/zfs-tests/tests/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
index 29c03429091bcf882226efbd308b3bc5ba83af51..49138d927e06f460d7276a44e1b88546f3dc0195 100644 (file)
--- 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