tests: Expand test checking quota and orphan processing interaction

Expand f_orphquot test to also check handling of quotas for non-root
user and verify that quota limits are properly preserved over orphan
replay.

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/tests/f_orphquot/expect b/tests/f_orphquot/expect
index 90a7813..f1f0b44 100644 (file)
--- a/tests/f_orphquot/expect
+++ b/tests/f_orphquot/expect
@@ -1,4 +1,4 @@
-Clearing orphaned inode 12 (uid=0, gid=0, mode=0100644, size=3842048)
+Clearing orphaned inode 12 (uid=1000, gid=100, mode=0100644, size=3145728)
 Pass 1: Checking inodes, blocks, and sizes
 Pass 2: Checking directory structure
 Pass 3: Checking directory connectivity
@@ -8,3 +8,9 @@ Pass 5: Checking group summary information
 test_filesystem: ***** FILE SYSTEM WAS MODIFIED *****
 test_filesystem: 11/512 files (9.1% non-contiguous), 1070/2048 blocks
 Exit status is 0
+   user id      blocks   quota    limit      inodes    quota    limit
+         0      20480        0        0           2        0        0
+      1000          0     5000     6000           0       50       60
+  group id      blocks   quota    limit      inodes    quota    limit
+         0      20480        0        0           2        0        0
+       100          0     6000     7000           0       60       70

diff --git a/tests/f_orphquot/image.bz2 b/tests/f_orphquot/image.bz2
index 44c8318..7ac17a0 100644 (file)
Binary files a/tests/f_orphquot/image.bz2 and b/tests/f_orphquot/image.bz2 differ

diff --git a/tests/f_orphquot/script b/tests/f_orphquot/script
index acdf567..e17bff0 100644 (file)
--- a/tests/f_orphquot/script
+++ b/tests/f_orphquot/script
@@ -8,6 +8,8 @@ rm -rf $OUT
 $FSCK -f -y -N test_filesystem $TMPFILE > $OUT.new 2>&1
 status=$?
 echo Exit status is $status >> $OUT.new
+$DEBUGFS -R 'lq user' $TMPFILE >> $OUT.new 2>&1
+$DEBUGFS -R 'lq group' $TMPFILE >> $OUT.new 2>&1
 sed -f $cmd_dir/filter.sed $OUT.new >> $OUT
 rm -f $OUT.new