diff options
| author | John Wren Kennedy <john.kennedy@delphix.com> | 2017-04-06 00:18:22 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2017-04-06 16:25:36 +0000 |
| commit | c1d9abf9059a19c2b48eaa645dbce2e1fba3e0b1 (patch) | |
| tree | e10f847d69d44292b0b641324cc5007b8c4badff /tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh | |
| parent | 7a4500a10102c00a67442628df2ac2395484757e (diff) | |
| download | src-c1d9abf9059a19c2b48eaa645dbce2e1fba3e0b1.tar.gz src-c1d9abf9059a19c2b48eaa645dbce2e1fba3e0b1.zip | |
OpenZFS 7290 - ZFS test suite needs to control what utilities it can run
Authored by: John Wren Kennedy <john.kennedy@delphix.com>
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
Ported-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>
Porting Notes:
- Utilities which aren't available under Linux have been removed.
- Because of sudo's default secure path behavior PATH must be
explicitly reset at the top of libtest.shlib. This avoids the
need for all users to customize secure path on their system.
- Updated ZoL infrastructure to manage constrained path
- Updated all test cases
- Check permissions for usergroup tests
- When testing in-tree create links under bin/
- Update fault cleanup such that missing files during
cleanup aren't fatal.
- Configure su environment with constrained path
OpenZFS-issue: https://www.illumos.org/issues/7290
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/1d32ba6
Closes #5903
Diffstat (limited to 'tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh')
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh index 2c768fcbbdf2..0ae13d3a9bad 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_003_neg.ksh @@ -25,6 +25,10 @@ # Use is subject to license terms. # +# +# Copyright (c) 2016 by Delphix. All rights reserved. +# + . $STF_SUITE/include/libtest.shlib . $STF_SUITE/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib @@ -45,10 +49,10 @@ verify_runnable "both" function cleanup { - $PKILL ${DD##*/} + pkill ${DD##*/} for snap in $FSSNAP0 $FSSNAP1 $FSSNAP2; do if snapexists $snap; then - log_must $ZFS destroy -Rf $snap + log_must zfs destroy -Rf $snap fi done } @@ -64,8 +68,8 @@ create_snapshot $TESTPOOL/$TESTFS $TESTSNAP1 # Run 'zfs rollback ""|-f <snap>' and it should fail. # -log_mustnot $ZFS rollback $TESTPOOL/$TESTFS@$TESTSNAP -log_mustnot $ZFS rollback -f $TESTPOOL/$TESTFS@$TESTSNAP +log_mustnot zfs rollback $TESTPOOL/$TESTFS@$TESTSNAP +log_mustnot zfs rollback -f $TESTPOOL/$TESTFS@$TESTSNAP # Create 'clone1' based on 'snap1'. # @@ -73,8 +77,8 @@ create_clone $TESTPOOL/$TESTFS@$TESTSNAP1 $TESTPOOL/$TESTCLONE1 # Run 'zfs rollback -r|-rf <snap>' and it should fail. # -log_mustnot $ZFS rollback -r $TESTPOOL/$TESTFS@$TESTSNAP -log_mustnot $ZFS rollback -rf $TESTPOOL/$TESTFS@$TESTSNAP +log_mustnot zfs rollback -r $TESTPOOL/$TESTFS@$TESTSNAP +log_mustnot zfs rollback -rf $TESTPOOL/$TESTFS@$TESTSNAP log_pass "zfs rollback ''|-f|-r|-rf will fail in different conditions " \ "passed." |