Module Name: src
Committed By: bouyer
Date: Sun Jan 30 19:49:48 UTC 2011
Modified Files:
src/tests/fs/ffs [bouyer-quota2]: t_getquota.sh t_setquota.sh
Log Message:
Remove rump.halt race workaround now that it's fixed in rump
Ajust for new quota tools output
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/tests/fs/ffs/t_getquota.sh
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 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_getquota.sh
diff -u src/tests/fs/ffs/t_getquota.sh:1.1.2.3 src/tests/fs/ffs/t_getquota.sh:1.1.2.4
--- src/tests/fs/ffs/t_getquota.sh:1.1.2.3 Sun Jan 30 13:23:26 2011
+++ src/tests/fs/ffs/t_getquota.sh Sun Jan 30 19:49:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_getquota.sh,v 1.1.2.3 2011/01/30 13:23:26 bouyer Exp $
+# $NetBSD: t_getquota.sh,v 1.1.2.4 2011/01/30 19:49:48 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -64,7 +64,7 @@
#check that we can get the expected quota
for q in ${expect} ; do
atf_check -s exit:0 \
--o "match:/mnt 0 - - 1 - -" \
+-o "match:/mnt 0 - - 7days 1 - - 7days" \
-o "match:Disk quotas for .*: $" \
$(atf_get_srcdir)/rump_quota -${q} -v
atf_check -s exit:0 \
@@ -83,9 +83,6 @@
$(atf_get_srcdir)/rump_repquota -${q} /mnt
done
atf_check -s exit:0 rump.halt
-#wait for rump server to be gone
- while [ -e ${RUMP_SOCKET} ] ; do done
- sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o "match:already clean" \
-o "match:Phase 6 - Check Quotas" \
Index: src/tests/fs/ffs/t_setquota.sh
diff -u src/tests/fs/ffs/t_setquota.sh:1.1.2.2 src/tests/fs/ffs/t_setquota.sh:1.1.2.3
--- src/tests/fs/ffs/t_setquota.sh:1.1.2.2 Sun Jan 30 13:23:26 2011
+++ src/tests/fs/ffs/t_setquota.sh Sun Jan 30 19:49:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_setquota.sh,v 1.1.2.2 2011/01/30 13:23:26 bouyer Exp $
+# $NetBSD: t_setquota.sh,v 1.1.2.3 2011/01/30 19:49:48 bouyer Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -75,7 +75,7 @@
atf_check -s exit:0 \
$(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
atf_check -s exit:0 \
--o "match:/mnt 0 10 40960 1 20 51200" \
+-o "match:/mnt 0 10 40960 7days 1 20 51200 7days" \
-o "match:Disk quotas for .*: $" \
$(atf_get_srcdir)/rump_quota -${q} -v
atf_check -s exit:0 \
@@ -93,13 +93,10 @@
-o "match:Disk quotas for .*: none$" \
$(atf_get_srcdir)/rump_quota -${q} -v
atf_check -s exit:0 \
--o "not-match:-- 0 - - 1 - -" \
+-o "not-match:-- 0 - -" \
$(atf_get_srcdir)/rump_repquota -${q} /mnt
done
atf_check -s exit:0 rump.halt
-#wait for rump server to be gone
- while [ -e ${RUMP_SOCKET} ] ; do done
- sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o "match:already clean" \
-o "match:Phase 6 - Check Quotas" \
@@ -137,7 +134,7 @@
atf_check -s exit:0 \
$(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
atf_check -s exit:0 \
--o "match:/mnt 0 10 40960 0 20 51200" \
+-o "match:/mnt 0 10 40960 7days 0 20 51200 7days" \
-o "match:Disk quotas for .*: $" \
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
@@ -153,9 +150,6 @@
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
atf_check -s exit:0 rump.halt
-#wait for rump server to be gone
- while [ -e ${RUMP_SOCKET} ] ; do done
- sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o "match:already clean" \
-o "match:Phase 6 - Check Quotas" \
@@ -193,7 +187,7 @@
atf_check -s exit:0 \
$(atf_get_srcdir)/rump_edquota -$q -s10k/20 -h40M/50k ${id}
atf_check -s exit:0 \
--o "match:/mnt 0 10 40960 0 20 51200" \
+-o "match:/mnt 0 10 40960 7days 0 20 51200 7days" \
-o "match:Default (user|group) disk quotas: $" \
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
@@ -209,9 +203,6 @@
$(atf_get_srcdir)/rump_quota -${q} -v ${id}
done
atf_check -s exit:0 rump.halt
-#wait for rump server to be gone
- while [ -e ${RUMP_SOCKET} ] ; do done
- sleep 1
# check that the quota inode creation didn't corrupt the filesystem
atf_check -s exit:0 -o "match:already clean" \
-o "match:Phase 6 - Check Quotas" \
