diff options
| author | Brian Behlendorf <[email protected]> | 2023-02-23 17:10:46 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-02-23 17:10:46 -0800 |
| commit | 6109d83df86321a21a0f7ef543d71bdc62f075a6 (patch) | |
| tree | d6f138c413df39365df41fa2e8c13a6e155da4f5 /tests | |
| parent | 89cd2197b94986d315b9b1be707b645baf59af4f (diff) | |
ZTS: Minor fixes
- The migration_012_pos.ksh test case was failing because of a
missing space after `log_must`.
- None of the tests listed in the runfiles should include the .ksh
suffix.
Reviewed-by: Richard Yao <[email protected]>
Reviewed-by: Brian Atkinson <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #14515
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/runfiles/common.run | 2 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/runfiles/common.run b/tests/runfiles/common.run index ed6ec4205..421a8650b 100644 --- a/tests/runfiles/common.run +++ b/tests/runfiles/common.run @@ -843,7 +843,7 @@ tests = ['recv_dedup', 'recv_dedup_encrypted_zvol', 'rsend_001_pos', 'send-c_recv_lz4_disabled', 'send-c_mixed_compression', 'send-c_stream_size_estimate', 'send-c_embedded_blocks', 'send-c_resume', 'send-cpL_varied_recsize', 'send-c_recv_dedup', 'send-L_toggle', - 'send_encrypted_incremental.ksh', 'send_encrypted_freeobjects', + 'send_encrypted_incremental', 'send_encrypted_freeobjects', 'send_encrypted_hierarchy', 'send_encrypted_props', 'send_encrypted_truncated_files', 'send_freeobjects', 'send_realloc_files', 'send_realloc_encrypted_files', 'send_spill_block', 'send_holds', diff --git a/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh b/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh index a92d11181..243136e76 100755 --- a/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh +++ b/tests/zfs-tests/tests/functional/migration/migration_012_pos.ksh @@ -55,7 +55,7 @@ log_assert "Migrating test file from $NEWFS_DEFAULT_FS fs to ZFS fs using cp" log_onexit cleanup -log_mustprepare $DNAME "cp $BNAME $NONZFS_TESTDIR/cp$$.cp" -log_mustmigrate $TESTDIR $SUMA $SUMB "cp $NONZFS_TESTDIR/cp$$.cp $BNAME" +log_must prepare $DNAME "cp $BNAME $NONZFS_TESTDIR/cp$$.cp" +log_must migrate $TESTDIR $SUMA $SUMB "cp $NONZFS_TESTDIR/cp$$.cp $BNAME" log_pass "Successfully migrated test file from $NEWFS_DEFAULT_FS fs to ZFS fs". |