Module Name: src
Committed By: bouyer
Date: Sun Jan 30 23:04:52 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: t_setquota.sh
Log Message:
Also set and check the grace time in edquota tests.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/tests/fs/ffs/t_setquota.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/ffs/t_setquota.sh
diff -u src/tests/fs/ffs/t_setquota.sh:1.1.2.3 src/tests/fs/ffs/t_setquota.sh:1.1.2.4
--- src/tests/fs/ffs/t_setquota.sh:1.1.2.3 Sun Jan 30 19:49:48 2011
+++ src/tests/fs/ffs/t_setquota.sh Sun Jan 30 23:04:52 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_setquota.sh,v 1.1.2.3 2011/01/30 19:49:48 bouyer Exp $
+# $NetBSD: t_setquota.sh,v 1.1.2.4 2011/01/30 23:04:52 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -73,9 +73,10 @@
for q in ${expect} ; do
local id=$(id -${q})
atf_check -s exit:0 \
- $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+ $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+ -t 2W/3D ${id}
atf_check -s exit:0 \
--o "match:/mnt 0 10 40960 7days 1 20 51200 7days" \
+-o "match:/mnt 0 10 40960 2weeks 1 20 51200 3days" \
-o "match:Disk quotas for .*: $" \
$(atf_get_srcdir)/rump_quota -${q} -v
atf_check -s exit:0 \
@@ -132,9 +133,10 @@
for q in ${expect} ; do
local id=1
atf_check -s exit:0 \
- $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+ $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+ -t 120W/255D ${id}
atf_check -s exit:0 \
--o "match:/mnt 0 10 40960 7days 0 20 51200 7days" \
+-o "match:/mnt 0 10 40960 2years 0 20 51200 9months" \
-o "match:Disk quotas for .*: $" \
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
@@ -185,9 +187,10 @@
for q in ${expect} ; do
local id="-d"
atf_check -s exit:0 \
- $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
+ $(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k \
+ -t 2H2M/3540 ${id}
atf_check -s exit:0 \
--o "match:/mnt 0 10 40960 7days 0 20 51200 7days" \
+-o "match:/mnt 0 10 40960 2:2 0 20 51200 59" \
-o "match:Default (user|group) disk quotas: $" \
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
