Re: [Libguestfs] [PATCH v3 5/5] appliance: Added filesystem_walk command tests

On Tuesday 05 April 2016 18:47:32 Matteo Cafasso wrote: > The tests check that the filesystem_walk command is able to retrieve > information regarding both existing and deleted files. > > A NTFS image is used as Ext3+ filesystems deletion is more aggressive > in terms of metadata removal. > > Signed-off-by: Matteo Cafasso <noxdafox(a)gmail.com&gt; > --- > tests/tsk/Makefile.am | 3 +- > tests/tsk/test-filesystem-walk.sh | 62 +++++++++++++++++++++++++++++++++++++++ > 2 files changed, 64 insertions(+), 1 deletion(-) > create mode 100755 tests/tsk/test-filesystem-walk.sh > > diff --git a/tests/tsk/Makefile.am b/tests/tsk/Makefile.am > index 0cd7c03..f9b2fef 100644 > --- a/tests/tsk/Makefile.am > +++ b/tests/tsk/Makefile.am > @@ -18,7 +18,8 @@ > include $(top_srcdir)/subdir-rules.mk > > TESTS = \ > - test-download-inode.sh > + test-download-inode.sh \ > + test-filesystem-walk.sh > > TESTS_ENVIRONMENT = $(top_builddir)/run --test > > diff --git a/tests/tsk/test-filesystem-walk.sh b/tests/tsk/test-filesystem-walk.sh > new file mode 100755 > index 0000000..ab7c1a9 > --- /dev/null > +++ b/tests/tsk/test-filesystem-walk.sh > @@ -0,0 +1,62 @@ > +#!/bin/bash - > +# libguestfs > +# Copyright (C) 2016 Red Hat Inc. > +# > +# 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; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will 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 to the Free Software > +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > + > +# Test the filesystem-walk command. > + > +if [ -n "$SKIP_TEST_FILESYSTEM_WALK_SH" ]; then > + echo "$0: test skipped because environment variable is set." > + exit 77 > +fi > + > +# Skip if TSK is not supported by the appliance. > +if ! guestfish add /dev/null : run : available "libtsk"; then > + echo "$0: skipped because TSK is not available in the appliance" > + exit 77 > +fi > + > +if [ ! -s ../../test-data/phony-guests/windows.img ]; then > + echo "$0: skipped because windows.img is zero-sized" > + exit 77 > +fi > + > +# create and delete a file then list the filesystem content > +output=$(guestfish --ro -a ../../test-data/phony-guests/windows.img \ > + run : \ > + mount /dev/sda2 / : \ > + write /test.txt "foobar" : \ > + rm /test.txt : \ > + umount / : \ > + filesystem-walk /dev/sda2) This is a bit unreadable, a better approach is to read commands from stdin; see for example fish/test-copy.sh. > + > +# test $MFT is in the list > +echo $output | grep -q "{ tsk_inode: 0 tsk_type: r tsk_size: .* tsk_name: \$MFT tsk_allocated: 1 }" Hmm are you sure this works when tracing is disabled? The default output in guestfish for structs is each field in a single line.

Unless you compare the whole output like other tests do, a better solution could be write this test using a scripting language like Perl: I think most, if not all, of the non-bash tests are Perl-based, and it would allow to do better checks for the return values.

Thanks, _______________________________________________ Libguestfs mailing list Libguestfs(a)redhat.com https://www.redhat.com/mailman/listinfo/libguestfs