]> granicus.if.org Git - zfs/commitdiff
Enable history test cases
authorBrian Behlendorf <behlendorf1@llnl.gov>
Tue, 26 Jul 2016 18:15:46 +0000 (11:15 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Wed, 27 Jul 2016 20:38:46 +0000 (13:38 -0700)
Updated test case history_001_pos.ksh so it can run in tree.  The
original test case assumed /usr/sbin/zfs and /usr/sbin/zpool were
the only valid locations for these utilities.  The same modification
has already been made too history_common.kshlib.

The only other failing test case was history_010_pos and that was
the result of the ":linux" suffix not being appended when checking
the long output in the test case.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4882

tests/runfiles/linux.run
tests/zfs-tests/tests/functional/history/Makefile.am
tests/zfs-tests/tests/functional/history/history_001_pos.ksh
tests/zfs-tests/tests/functional/history/history_common.kshlib

index 482a6ae5f01ec11fc13509c41fde28ea7e7071d4..42a82e4b3807214b506a301c08e1fab7681434f2 100644 (file)
@@ -428,16 +428,11 @@ tests = ['large_dnode_001_pos', 'large_dnode_002_pos', 'large_dnode_003_pos',
 #pre =
 #post =
 
-# DISABLED:
-# history_001_pos - export commands missing from history
-# history_003_pos - nested pool
-# history_006_neg - needs investigation
-# history_007_pos - needs investigation
-# history_008_pos - needs investigation
-# history_010_pos - needs investigation
 [tests/functional/history]
-tests = ['history_002_pos', 'history_004_pos', 'history_005_neg',
-    'history_009_pos']
+tests = ['history_001_pos', 'history_002_pos', 'history_003_pos',
+    'history_004_pos', 'history_005_neg', 'history_006_neg',
+    'history_007_pos', 'history_008_pos', 'history_009_pos',
+    'history_010_pos']
 
 [tests/functional/inheritance]
 tests = ['inherit_001_pos']
index b96c6e6396812031130a13b02cf0dced5dc05609..861f4129941d3a988d8806d9d1cabed431a0d1da 100644 (file)
@@ -13,10 +13,7 @@ dist_pkgdata_SCRIPTS = \
        history_007_pos.ksh \
        history_008_pos.ksh \
        history_009_pos.ksh \
-       history_010_pos.ksh
-
-
-EXTRA_DIST = \
+       history_010_pos.ksh \
        i386.migratedpool.DAT.Z \
        i386.orig_history.txt \
        sparc.migratedpool.DAT.Z \
index e5a5c8327bba219a349dc090dab134ab341db6c6..e63d5ac505cd7169c721580349aad9fd2466b483 100755 (executable)
@@ -92,10 +92,21 @@ for i in 0 2; do
        $ZPOOL history $MPOOL > $TMP_HISTORY 2>/dev/null
        $DIFF $OLD_HISTORY $TMP_HISTORY | $GREP "^> " | $SED 's/^> //g' > \
            $NEW_HISTORY
-       $GREP "$($ECHO "$cmd1" | $SED 's/\/usr\/sbin\///g')" $NEW_HISTORY \
-           >/dev/null 2>&1 || log_fail "Didn't find \"$cmd1\" in pool history"
-       $GREP "$($ECHO "$cmd2" | $SED 's/\/usr\/sbin\///g')" $NEW_HISTORY \
-           >/dev/null 2>&1 || log_fail "Didn't find \"$cmd2\" in pool history"
+        if is_linux; then
+               $GREP "$($ECHO "$cmd1" | $SED 's/^.*\/\(zpool .*\).*$/\1/')" \
+                   $NEW_HISTORY >/dev/null 2>&1 || \
+                   log_fail "Didn't find \"$cmd1\" in pool history"
+               $GREP "$($ECHO "$cmd2" | $SED 's/^.*\/\(zpool .*\).*$/\1/')" \
+                   $NEW_HISTORY >/dev/null 2>&1 || \
+                   log_fail "Didn't find \"$cmd2\" in pool history"
+        else
+               $GREP "$($ECHO "$cmd1" | $SED 's/\/usr\/sbin\///g')" \
+                   $NEW_HISTORY >/dev/null 2>&1 || \
+                   log_fail "Didn't find \"$cmd1\" in pool history"
+               $GREP "$($ECHO "$cmd2" | $SED 's/\/usr\/sbin\///g')" \
+                   $NEW_HISTORY >/dev/null 2>&1 || \
+                   log_fail "Didn't find \"$cmd2\" in pool history"
+        fi
 done
 
 run_and_verify -p "$MPOOL" "$ZPOOL split $MPOOL ${MPOOL}_split"
index e1f1d06d272cf21e06e646dd3b5123c34581a063..640666ca136e79568c80e9007764a58160e7e36a 100644 (file)
@@ -109,8 +109,13 @@ function verify_long
                hname=$hname:$($ZONENAME)
        fi
 
-       $GREP "$cmd \[user $uid ($user) on $hname\]" $NEW_HISTORY >/dev/null \
-           2>&1
+       typeset suffix=""
+       if [ is_linux ]; then
+               suffix=":linux"
+       fi
+
+       $GREP "$cmd \[user $uid ($user) on $hname$suffix\]" \
+           $NEW_HISTORY >/dev/null 2>&1
        if [[ $? != 0 ]]; then
                log_note "Couldn't find long information for \"$cmd\""
                return 1