Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and reenable zfs_rename tests #8088

Merged
merged 1 commit into from
Nov 8, 2018
Merged

Fix and reenable zfs_rename tests #8088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tests/test-runner/bin/zts-report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,6 @@
'cli_root/zdb/zdb_006_pos': ['FAIL', known_reason],
'cli_root/zfs_get/zfs_get_004_pos': ['FAIL', known_reason],
'cli_root/zfs_get/zfs_get_009_pos': ['SKIP', '5479'],
'cli_root/zfs_rename/zfs_rename_006_pos': ['FAIL', '5647'],
'cli_root/zfs_rename/zfs_rename_009_neg': ['FAIL', '5648'],
'cli_root/zfs_rollback/zfs_rollback_001_pos': ['FAIL', '6415'],
'cli_root/zfs_rollback/zfs_rollback_002_pos': ['FAIL', '6416'],
'cli_root/zfs_share/setup': ['SKIP', share_reason],
Expand Down
1 change: 1 addition & 0 deletions tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_006_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ rename_dataset ${vol}-new $vol

clone=$TESTPOOL/${snap}_clone
create_clone $vol@$snap $clone
block_device_wait

#verify data integrity
for input in $VOL_R_PATH $ZVOL_RDEVDIR/$clone; do
Expand Down
14 changes: 7 additions & 7 deletions tests/zfs-tests/tests/functional/cli_root/zfs_rename/zfs_rename_009_neg.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@

#
# DESCRIPTION:
# A snapshot already exists with the new name, then none of the
# snapshots is renamed.
# When renaming a set of snapshots, if a snapshot already exists with
# the new name, then none of the snapshots is renamed.
#
# STRATEGY:
# 1. Create snapshot for a set of datasets.
# 1. Create a snapshot for a set of datasets.
# 2. Create a new snapshot for one of datasets.
# 3. Using rename -r command with exists snapshot name.
# 3. Attempt to "zfs rename -r" with the second snapshot's name.
# 4. Verify none of the snapshots is renamed.
#

Expand All @@ -54,7 +54,7 @@ function cleanup
done
}

log_assert "zfs rename -r failed, when snapshot name is already existing."
log_assert "Verify zfs rename -r failed when the snapshot name already exists."
log_onexit cleanup

set -A datasets $TESTPOOL $TESTPOOL/$TESTCTR \
Expand All @@ -71,7 +71,7 @@ while ((i < ${#datasets[@]})); do
log_mustnot zfs rename -r ${TESTPOOL}@snap ${TESTPOOL}@snap2
log_must zfs destroy ${datasets[$i]}@snap2

# Check datasets, make sure none of them was renamed.
# Check datasets, make sure none of them have snap2.
typeset -i j=0
while ((j < ${#datasets[@]})); do
if datasetexists ${datasets[$j]}@snap2 ; then
Expand All @@ -83,4 +83,4 @@ while ((i < ${#datasets[@]})); do
((i += 1))
done

log_pass "zfs rename -r failed, when snapshot name is already existing passed."
log_pass "zfs rename -r failed when the snapshot name already exists."