On Wed, Apr 26, 2017 at 05:05:47PM -0500, Bill O'Donnell wrote:
> The manpage for xfs_growfs specifies that the file/dir to be
> grown must be mounted. This is a test to ensure that if the
> target isn't mounted, the command is rejected. The intention
> is to test the command response, but not necessarily the
> functionality of xfs_growfs. Absolute paths and relative paths
> are covered, including symbolic links and bind mounts.
>
> Signed-off-by: Bill O'Donnell <billodo@xxxxxxxxxx>
> ---
> v2: acually grow the fs as test proceeds; add filter, preventing
> superfluous stdio verbiage; add test for (unmounted) file; add
> description to commit message to clarify that this isn't a test
> for xfs_growfs functionality, but rather a test of command
> argument accepts and rejections.
>
> tests/xfs/288 | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> tests/xfs/288.out | 23 ++++++++++
> tests/xfs/group | 1 +
> 3 files changed, 148 insertions(+)
> create mode 100755 tests/xfs/288
> create mode 100644 tests/xfs/288.out
>
> diff --git a/tests/xfs/288 b/tests/xfs/288
> new file mode 100755
> index 0000000..51f5c32
> --- /dev/null
> +++ b/tests/xfs/288
> @@ -0,0 +1,124 @@
> +#! /bin/bash
> +# FS QA Test 288
> +#
> +# Test to ensure xfs_growfs command rejects non-existent mount points
> +# and accepts mounted targets.
I noticed Eric's comments to the v3 xfsprogs patch, I think this
description and commit summary can be updated too :)
> +#
> +#-----------------------------------------------------------------------
> +# Copyright (c) 2017 Red Hat, Inc. All Rights Reserved.
> +#
> +# This program is free software; you can redistribute it and/or
> +# modify it under the terms of the GNU General Public License as
> +# published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope that it would be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, write the Free Software Foundation,
> +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
> +#-----------------------------------------------------------------------
> +#
> +
> +seq=`basename $0`
> +seqres=$RESULT_DIR/$seq
> +echo "QA output created by $seq"
> +
> +here=`pwd`
> +tmp=/tmp/$$
> +status=1 # failure is the default!
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
> +_cleanup()
> +{
> + umount $tmpdir
> + umount $tmpbind
$UMOUNT_PROG
> + rmdir $tmpdir
> + rm -f $tmpsymlink
> + rmdir $tmpbind
> + rm -f $tmp
rm -f $tmp.*
$tmp itself is not used.
> + rm -f $tmpfile
> +}
> +
> +# get standard environment, filters and checks
> +. ./common/rc
> +. ./common/filter
> +
> +# remove previous $seqres.full before test
> +rm -f $seqres.full
> +
> +# real QA test starts here
> +
> +# Modify as appropriate.
> +_supported_fs xfs
> +_supported_os Linux
> +_require_test
> +_require_loop
> +
> +tmpfile=$TEST_DIR/fsfile
> +tmpdir=$TEST_DIR/tmpdir
> +tmpsymlink=$TEST_DIR/tmpsymlink.$$
> +tmpbind=$TEST_DIR/tmpbind.$$
> +
> +mkdir -p $tmpdir || _fail "!!! failed to create temp mount dir"
> +
> +echo "=== mkfs.xfs ==="
> +$MKFS_XFS_PROG -d file,name=$tmpfile,size=16m -f | _filter_mkfs 2>$tmp.mkfs >/dev/null
I don't see how $tmp.mkfs was used in this test, seems we can discard
mkfs output directly, the _filter_mkfs seems useless.
$MKFS_XFS_PROG -d file,name=$tmpfile,size=16m -f >/dev/null 2>&1
> +
> +echo "=== truncate ==="
> +truncate --size=256m $tmpfile
$XFS_IO_PROG -fc "truncate 256m" $tmpfile
> +
> +echo "=== xfs_growfs - unmounted, command should be rejected ==="
> +$XFS_GROWFS_PROG $tmpdir
As Darrick said, need _filter_test_dir here, and all other growfs calls
using absolute path.
> +
> +echo "=== xfs_growfs - check relative path, unmounted ==="
> +cd $TEST_DIR
> +$XFS_GROWFS_PROG ./tmpdir
> +
> +echo "=== xfs_growfs - no path, unmounted ==="
> +$XFS_GROWFS_PROG tmpdir
> +
> +echo "=== xfs_growfs - plain file - should be rejected ==="
> +$XFS_GROWFS_PROG $tmpfile
> +
> +echo "=== mount ==="
> +mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
$MOUNT_PROG
> +
> +echo "=== xfs_growfs - mounted - check absolute path ==="
> +$XFS_GROWFS_PROG -D 8192 $tmpdir | _filter_growfs >$tmp.growfs
All these "$tmp.growfs"s are overwritten after each xfs_growfs command,
and are not used at all. If the stdout is not important, we can just
discard it, if stdout is useful for debug purpose, we can append stdout
of each xfs_growfs to $seqres.full file.
Thanks,
Eryu
> +
> +echo "=== xfs_growfs - check relative path ==="
> +$XFS_GROWFS_PROG -D 12288 ./tmpdir | _filter_growfs >$tmp.growfs
> +
> +echo "=== xfs_growfs - no path ==="
> +$XFS_GROWFS_PROG -D 16384 tmpdir | _filter_growfs >$tmp.growfs
> +
> +echo "=== xfs_growfs - symbolic link ==="
> +ln -s $tmpdir $tmpsymlink
> +$XFS_GROWFS_PROG -D 20480 $tmpsymlink | _filter_growfs >$tmp.growfs
> +
> +echo "=== xfs_growfs - symbolic link using relative path ==="
> +$XFS_GROWFS_PROG -D 24576 ./tmpsymlink.$$ | _filter_growfs >$tmp.growfs
> +
> +echo "=== xfs_growfs - symbolic link using no path ==="
> +$XFS_GROWFS_PROG -D 28672 tmpsymlink.$$ | _filter_growfs >$tmp.growfs
> +
> +echo "=== xfs_growfs - bind mount ==="
> +mkdir $tmpbind
> +mount -o bind $tmpdir $tmpbind
> +$XFS_GROWFS_PROG -D 32768 $tmpbind | _filter_growfs >$tmp.growfs
> +
> +echo "=== xfs_growfs - bind mount - relative path ==="
> +$XFS_GROWFS_PROG -D 36864 ./tmpbind.$$ | _filter_growfs >$tmp.growfs
> +
> +echo "=== xfs_growfs - bind mount - no path ==="
> +$XFS_GROWFS_PROG -D 40960 tmpbind.$$ | _filter_growfs >$tmp.growfs
> +
> +echo "=== xfs_growfs - plain file - should be rejected ==="
> +$XFS_GROWFS_PROG $tmpfile
> +
> +# success, all done
> +status=0
> +exit
> diff --git a/tests/xfs/288.out b/tests/xfs/288.out
> new file mode 100644
> index 0000000..318aa8c
> --- /dev/null
> +++ b/tests/xfs/288.out
> @@ -0,0 +1,23 @@
> +QA output created by 288
> +=== mkfs.xfs ===
> +=== truncate ===
> +=== xfs_growfs - unmounted, command should be rejected ===
> +xfs_growfs: /mnt/test/tmpdir is not a mounted XFS filesystem
> +=== xfs_growfs - check relative path, unmounted ===
> +xfs_growfs: ./tmpdir is not a mounted XFS filesystem
> +=== xfs_growfs - no path, unmounted ===
> +xfs_growfs: tmpdir is not a mounted XFS filesystem
> +=== xfs_growfs - plain file - should be rejected ===
> +xfs_growfs: /mnt/test/fsfile is not a mounted XFS filesystem
> +=== mount ===
> +=== xfs_growfs - mounted - check absolute path ===
> +=== xfs_growfs - check relative path ===
> +=== xfs_growfs - no path ===
> +=== xfs_growfs - symbolic link ===
> +=== xfs_growfs - symbolic link using relative path ===
> +=== xfs_growfs - symbolic link using no path ===
> +=== xfs_growfs - bind mount ===
> +=== xfs_growfs - bind mount - relative path ===
> +=== xfs_growfs - bind mount - no path ===
> +=== xfs_growfs - plain file - should be rejected ===
> +xfs_growfs: /mnt/test/fsfile is not a mounted XFS filesystem
> diff --git a/tests/xfs/group b/tests/xfs/group
> index 75769f9..0dcb8e0 100644
> --- a/tests/xfs/group
> +++ b/tests/xfs/group
> @@ -285,6 +285,7 @@
> 285 dangerous_fuzzers dangerous_scrub
> 286 dangerous_fuzzers dangerous_scrub dangerous_online_repair
> 287 auto dump quota quick
> +288 growfs auto quick
> 290 auto rw prealloc quick ioctl zero
> 291 auto repair
> 292 auto mkfs quick
> --
> 2.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
