[src/trunk]: src - Add new tests for -c check flag in resize_ffs

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src - Add new tests for -c check flag in resize_ffs
From: chopps <chopps%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 04:36:28 +0000
details:   https://anonhg.NetBSD.org/src/rev/9886dab5eb9c
branches:  trunk
changeset: 807137:9886dab5eb9c
user:      chopps <chopps%NetBSD.org@localhost>
date:      Sun Mar 29 19:37:02 2015 +0000

description:
- Add new tests for -c check flag in resize_ffs

diffstat:

 distrib/sets/lists/tests/mi               |   3 +-
 tests/sbin/resize_ffs/Makefile            |   4 +-
 tests/sbin/resize_ffs/common.sh           |   4 ++
 tests/sbin/resize_ffs/t_check.sh          |  56 +++++++++++++++++++++++++++++++
 tests/sbin/resize_ffs/t_grow.sh           |   4 +-
 tests/sbin/resize_ffs/t_grow_swapped.sh   |   4 +-
 tests/sbin/resize_ffs/t_shrink.sh         |   4 +-
 tests/sbin/resize_ffs/t_shrink_swapped.sh |   4 +-
 8 files changed, 76 insertions(+), 7 deletions(-)

diffs (193 lines):

diff -r 8c8a99c500da -r 9886dab5eb9c distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Sun Mar 29 19:35:58 2015 +0000
+++ b/distrib/sets/lists/tests/mi       Sun Mar 29 19:37:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.612 2015/02/06 22:24:15 rjs Exp $
+# $NetBSD: mi,v 1.613 2015/03/29 19:37:02 chopps Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3245,6 +3245,7 @@
 ./usr/tests/sbin/resize_ffs                    tests-sbin-tests
 ./usr/tests/sbin/resize_ffs/Atffile            tests-sbin-tests        atf
 ./usr/tests/sbin/resize_ffs/Kyuafile           tests-sbin-tests        atf,kyua
+./usr/tests/sbin/resize_ffs/t_check            tests-sbin-tests        atf
 ./usr/tests/sbin/resize_ffs/t_grow             tests-sbin-tests        atf
 ./usr/tests/sbin/resize_ffs/t_grow_swapped     tests-sbin-tests        atf
 ./usr/tests/sbin/resize_ffs/t_resize_ffs       tests-obsolete          obsolete
diff -r 8c8a99c500da -r 9886dab5eb9c tests/sbin/resize_ffs/Makefile
--- a/tests/sbin/resize_ffs/Makefile    Sun Mar 29 19:35:58 2015 +0000
+++ b/tests/sbin/resize_ffs/Makefile    Sun Mar 29 19:37:02 2015 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/01/05 02:25:27 riz Exp $
+# $NetBSD: Makefile,v 1.4 2015/03/29 19:37:02 chopps Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/sbin/resize_ffs
 
-.for name in t_grow t_shrink t_grow_swapped t_shrink_swapped
+.for name in t_check t_grow t_shrink t_grow_swapped t_shrink_swapped
 TESTS_SH+=     ${name}
 TESTS_SH_SRC_${name}=  common.sh ${name}.sh
 .endfor
diff -r 8c8a99c500da -r 9886dab5eb9c tests/sbin/resize_ffs/common.sh
--- a/tests/sbin/resize_ffs/common.sh   Sun Mar 29 19:35:58 2015 +0000
+++ b/tests/sbin/resize_ffs/common.sh   Sun Mar 29 19:37:02 2015 +0000
@@ -146,6 +146,8 @@
        fi
 
        umount mnt
+       # Check that resize needed
+       atf_check -s exit:0 -o ignore resize_ffs -c -y -s ${nsize} ${IMG}
        atf_check -s exit:0 -o ignore resize_ffs -y -s ${nsize} ${IMG}
        atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
        atf_check -s exit:0 -e ignore rump_ffs ${IMG} mnt
@@ -155,5 +157,7 @@
            # checking everything because we don't delete on grow
            check_data_range 1 ${numdata}
        fi
+       # Check that no resize needed
+       atf_check -s exit:1 -o ignore resize_ffs -c -y -s ${nsize} ${IMG}
        umount mnt
 }
diff -r 8c8a99c500da -r 9886dab5eb9c tests/sbin/resize_ffs/t_check.sh
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/sbin/resize_ffs/t_check.sh  Sun Mar 29 19:37:02 2015 +0000
@@ -0,0 +1,56 @@
+# $NetBSD: t_check.sh,v 1.1 2015/03/29 19:37:02 chopps Exp $
+#
+# Copyright (c) 2010 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Christian E. Hopps
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+atf_test_case check_grow
+
+check_grow_head() {
+       atf_set "descr" "Tests check for room to grow in image"
+       atf_set "require.user" "root"
+}
+
+check_grow_body() {
+       echo "***resize_ffs check grow test"
+
+       atf_check -o ignore -e ignore newfs -V1 -s 6144 -F ${IMG}
+       dd if=/dev/zero count=2048 >> ${IMG}
+
+       # test room to grow, grow then check that we did.
+       atf_check -s exit:0 -o match:"newsize: 8192 oldsize: 6144" resize_ffs -v -c -y ${IMG}
+       atf_check -s exit:0 -o ignore resize_ffs -y ${IMG}
+       atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+       atf_check -s exit:1 -o match:"already 8192 blocks" \
+           resize_ffs -v -c -y ${IMG}
+}
+
+atf_init_test_cases()
+{
+       setupvars
+       atf_add_test_case check_grow
+}
diff -r 8c8a99c500da -r 9886dab5eb9c tests/sbin/resize_ffs/t_grow.sh
--- a/tests/sbin/resize_ffs/t_grow.sh   Sun Mar 29 19:35:58 2015 +0000
+++ b/tests/sbin/resize_ffs/t_grow.sh   Sun Mar 29 19:37:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_grow.sh,v 1.8 2011/01/11 00:50:02 riz Exp $
+# $NetBSD: t_grow.sh,v 1.9 2015/03/29 19:37:02 chopps Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -131,8 +131,10 @@
        atf_check -o ignore -e ignore newfs -V1 -s 4000 -F ${IMG}
 
        # size to grow to is chosen to cause partial cg
+       atf_check -s exit:0 -o ignore resize_ffs -c -y -s 5760 ${IMG}
        atf_check -s exit:0 -o ignore resize_ffs -y -s 5760 ${IMG}
        atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+       atf_check -s exit:1 -o ignore resize_ffs -c -y -s 5760 ${IMG}
 }
 
 atf_init_test_cases()
diff -r 8c8a99c500da -r 9886dab5eb9c tests/sbin/resize_ffs/t_grow_swapped.sh
--- a/tests/sbin/resize_ffs/t_grow_swapped.sh   Sun Mar 29 19:35:58 2015 +0000
+++ b/tests/sbin/resize_ffs/t_grow_swapped.sh   Sun Mar 29 19:37:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_grow_swapped.sh,v 1.2 2011/01/11 00:50:02 riz Exp $
+# $NetBSD: t_grow_swapped.sh,v 1.3 2015/03/29 19:37:02 chopps Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -130,8 +130,10 @@
        atf_check -o ignore -e ignore newfs -B be -V1 -s 4000 -F ${IMG}
 
        # size to grow to is chosen to cause partial cg
+       atf_check -s exit:0 -o ignore resize_ffs -c -y -s 5760 ${IMG}
        atf_check -s exit:0 -o ignore resize_ffs -y -s 5760 ${IMG}
        atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+       atf_check -s exit:1 -o ignore resize_ffs -c -y -s 5760 ${IMG}
 }
 
 atf_init_test_cases()
diff -r 8c8a99c500da -r 9886dab5eb9c tests/sbin/resize_ffs/t_shrink.sh
--- a/tests/sbin/resize_ffs/t_shrink.sh Sun Mar 29 19:35:58 2015 +0000
+++ b/tests/sbin/resize_ffs/t_shrink.sh Sun Mar 29 19:37:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_shrink.sh,v 1.7 2011/01/05 02:25:27 riz Exp $
+# $NetBSD: t_shrink.sh,v 1.8 2015/03/29 19:37:02 chopps Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -112,8 +112,10 @@
        atf_check -o ignore -e ignore newfs -V1 -F -s 5760 ${IMG}
 
        # shrink so there's a partial cg at the end
+       atf_check -s exit:0 resize_ffs -c -s 4000 -y ${IMG}
        atf_check -s exit:0 resize_ffs -s 4000 -y ${IMG}
        atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+       atf_check -s exit:1 resize_ffs -c -s 4000 -y ${IMG}
 }
 
 atf_init_test_cases()
diff -r 8c8a99c500da -r 9886dab5eb9c tests/sbin/resize_ffs/t_shrink_swapped.sh
--- a/tests/sbin/resize_ffs/t_shrink_swapped.sh Sun Mar 29 19:35:58 2015 +0000
+++ b/tests/sbin/resize_ffs/t_shrink_swapped.sh Sun Mar 29 19:37:02 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: t_shrink_swapped.sh,v 1.1 2011/01/05 02:25:27 riz Exp $
+# $NetBSD: t_shrink_swapped.sh,v 1.2 2015/03/29 19:37:02 chopps Exp $
 #
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -112,8 +112,10 @@
        atf_check -o ignore -e ignore newfs -V1 -F -s 5760 ${IMG}
 
        # shrink so there's a partial cg at the end
+       atf_check -s exit:0 resize_ffs -c -s 4000 -y ${IMG}
        atf_check -s exit:0 resize_ffs -s 4000 -y ${IMG}
        atf_check -s exit:0 -o ignore fsck_ffs -f -n -F ${IMG}
+       atf_check -s exit:1 resize_ffs -c -s 4000 -y ${IMG}
 }
 
 atf_init_test_cases()
Prev by Date: [src/trunk]: src - Fix fallout for recent bread() change (removing cred arg).
Next by Date: [src/trunk]: src/sbin/resize_ffs New sentence, new line. Sort option descript...
Previous by Thread: [src/trunk]: src - Fix fallout for recent bread() change (removing cred arg).
Next by Thread: [src/trunk]: src/sbin/resize_ffs New sentence, new line. Sort option descript...
Indexes:
Home | Main Index | Thread Index | Old Index