fstests: use _require_symlinks on all necessary tests

[xfstests-dev.git] / tests / generic / 399

diff --git a/tests/generic/399 b/tests/generic/399
index 5e55096fd62427415a60e0920c11c6db54797a5a..a40137207dec1ddf3d6d35758c6cb41afa79b902 100755 (executable)
--- a/tests/generic/399
+++ b/tests/generic/399
@@ -43,7 +43,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os Linux
 _require_scratch_encryption
-_require_xfs_io_command "set_encpolicy"
+_require_symlinks
 _require_command "$XZ_PROG" xz
 _require_command "$KEYCTL_PROG" keyctl
 
@@ -62,9 +62,9 @@ dd if=/dev/zero of=$SCRATCH_DEV bs=$((1024 * 1024)) \
 _scratch_mkfs_sized_encrypted $fs_size &>> $seqres.full
 _scratch_mount
 
-keydesc=$(_generate_encryption_key)
+keydesc=$(_generate_session_encryption_key)
 mkdir $SCRATCH_MNT/encrypted_dir
-$XFS_IO_PROG -c "set_encpolicy $keydesc" $SCRATCH_MNT/encrypted_dir
+_set_encpolicy $SCRATCH_MNT/encrypted_dir $keydesc
 
 # Create the "same" symlink in two different directories.
 # Later we'll check both the name and target of the symlink.
@@ -83,28 +83,38 @@ total_file_size=0
 i=1
 while true; do
        file=$SCRATCH_MNT/encrypted_dir/file$i
-       if ! $XFS_IO_PROG -f $file -c 'pwrite 0 1M' &> $tmp.out; then
-               if ! grep -q 'No space left on device' $tmp.out; then
-                       echo "FAIL: unexpected pwrite failure"
-                       cat $tmp.out
-               elif [ -e $file ]; then
-                       total_file_size=$((total_file_size + $(stat -c %s $file)))
-               fi
-               break
+
+       $XFS_IO_PROG -f $file -c 'pwrite 0 1M' &> $tmp.out
+       echo "Writing $file..." >> $seqres.full
+       cat $tmp.out >> $seqres.full
+
+       file_size=0
+       if [ -e $file ]; then
+               file_size=$(_get_filesize $file)
        fi
-       total_file_size=$((total_file_size + $(stat -c %s $file)))
-       i=$((i + 1))
-       if [ $i -gt $fs_size_in_mb ]; then
-               echo "FAIL: filesystem never filled up!"
+
+       # We shouldn't have been able to write more data than we had space for.
+       (( total_file_size += file_size ))
+       if (( total_file_size > fs_size )); then
+               _fail "Wrote $total_file_size bytes but should have only" \
+                     "had space for $fs_size bytes at most!"
+       fi
+
+       # Stop if we hit ENOSPC.
+       if grep -q 'No space left on device' $tmp.out; then
                break
        fi
-done
 
-# We shouldn't have been able to write more data than we had space for.
-if (( $total_file_size > $fs_size )); then
-       echo "FAIL: wrote $total_file_size bytes but should have only" \
-               "had space for $fs_size bytes at most"
-fi
+       # Otherwise the file should have been successfully created.
+       if [ ! -e $file ]; then
+               _fail "$file failed to be created, but the fs isn't out of space yet!"
+       fi
+       if (( file_size != 1024 * 1024 )); then
+               _fail "Size of $file is wrong (possible write error?)." \
+                     "Got $file_size, expected 1 MiB"
+       fi
+       (( i++ ))
+done
 
 #
 # Unmount the filesystem and compute its compressed size.  It must be no smaller
@@ -118,7 +128,7 @@ fi
 # memory than the '-9' preset.  The memory needed with our settings will be
 # 64 * 6.5 = 416 MB; see xz(1).
 #
-_unlink_encryption_key $keydesc
+_unlink_session_encryption_key $keydesc
 _scratch_unmount
 fs_compressed_size=$(head -c $fs_size $SCRATCH_DEV | \
        xz --lzma2=dict=64M,mf=hc4,mode=fast,nice=16 | \