search for: skip_if_skip

Previously I posted a work-in-progress preview of this patch series: https://www.redhat.com/archives/libguestfs/2017-February/msg00224.html This is the finished version that updates all of the shell-script based tests. It passes 'make check', 'make check-direct' and 'make check-slow'. Rich.

Make sure the pod checker script can deal with the newer additions of podwrapper.pl. Followup of commit 46e59e9535c2fcd1c188464b5249a249f22af1a0. --- podcheck.pl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/podcheck.pl b/podcheck.pl index 527a2e47d..795fe0e9b 100755 --- a/podcheck.pl +++ b/podcheck.pl @@ -83,6 +83,15 @@ used where the POD includes

...rsify-docs.sh | 1 + sysprep/test-virt-sysprep-docs.sh | 1 + 10 files changed, 22 insertions(+), 11 deletions(-) diff --git a/cat/test-docs.sh b/cat/test-docs.sh index 30cc1eeb4..0d6d5461a 100755 --- a/cat/test-docs.sh +++ b/cat/test-docs.sh @@ -21,9 +21,14 @@ set -e $TEST_FUNCTIONS skip_if_skipped -$top_srcdir/podcheck.pl virt-cat.pod virt-cat -$top_srcdir/podcheck.pl virt-filesystems.pod virt-filesystems -$top_srcdir/podcheck.pl virt-log.pod virt-log +$top_srcdir/podcheck.pl virt-cat.pod virt-cat \ + --path $top_srcdir/common/options +$top_srcdir/podcheck.pl virt...

Fix one dist issue, and various builddir!=srcdir issues, also with the patch proposed in the Debian bug #946594. Patch #3 applies also to the virt-v2v repository, and will be committed there too (with references to the libguestfs commit). Pino Toscano (3): inspector: ship the actual test script tests: fix srcdir references build: fix make implicit dependencies on ml/mli files

There's a lot of common code in the tests, eg: if [ "$(guestfish get-backend)" = "uml" ]; then echo "$0: test skipped because UML backend does not support network" exit 77 fi These commits (work in progress) create a common set of test functions for skipping tests etc. Rich.

...alled. --- v2v/test-v2v-o-rhv-upload.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/v2v/test-v2v-o-rhv-upload.sh b/v2v/test-v2v-o-rhv-upload.sh index 8bda7cc0b..29214a9db 100755 --- a/v2v/test-v2v-o-rhv-upload.sh +++ b/v2v/test-v2v-o-rhv-upload.sh @@ -28,6 +28,7 @@ set -x $TEST_FUNCTIONS skip_if_skipped skip_if_backend uml +skip_unless nbdkit file --version skip_unless_phony_guest windows.img libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" -- 2.17.1

...08.html v2v/test-v2v-o-rhv-upload.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/v2v/test-v2v-o-rhv-upload.sh b/v2v/test-v2v-o-rhv-upload.sh index 8bda7cc0b..23d2ad7a0 100755 --- a/v2v/test-v2v-o-rhv-upload.sh +++ b/v2v/test-v2v-o-rhv-upload.sh @@ -28,6 +28,8 @@ set -x $TEST_FUNCTIONS skip_if_skipped skip_if_backend uml +skip_unless python3 --version +skip_unless nbdkit python3 --version skip_unless_phony_guest windows.img libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" -- 2.17.1

Add a single shell script to hold results of configure. Pino Toscano (3): build: add an empty config.sh Revert "tests: rhv-upload: Fix skip test of nbdkit python plugin." tests: use the right nbdkit python3 plugin .gitignore | 2 +- config.sh.in | 22 +++++++++++++++++++ configure.ac

...st-tools-messages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mltools/test-tools-messages.sh b/mltools/test-tools-messages.sh index 0e24d6c..73e1beb 100755 --- a/mltools/test-tools-messages.sh +++ b/mltools/test-tools-messages.sh @@ -25,4 +25,4 @@ set -x $TEST_FUNCTIONS skip_if_skipped -$PYTHON parse_tools_messages_test.py +$PYTHON "$srcdir/parse_tools_messages_test.py" -- 2.23.0

...: + $(top_builddir)/run guestfish -N $@=part exit + virt-p2v.img: \ dependencies.m4 \ issue \ diff --git a/p2v/test-virt-p2v-nbdkit.sh b/p2v/test-virt-p2v-nbdkit.sh index 6e7ae2129..5c635bb03 100755 --- a/p2v/test-virt-p2v-nbdkit.sh +++ b/p2v/test-virt-p2v-nbdkit.sh @@ -25,10 +25,10 @@ skip_if_skipped skip_if_backend uml skip_unless nbdkit file --version skip_unless test -f fedora.img -skip_unless_phony_guest blank-part.img +skip_unless test -f blank-part.img f1="$abs_builddir/fedora.img" -f2="$abs_top_builddir/test-data/phony-guests/blank-part.img" +f2="$abs_bu...

...eceived 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 -i ova option with a good manifest containing a bad SHA1 checksum. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped +skip_if_backend uml +skip_unless_phony_guest windows.img + +if [ ! -f windows.vmdk -o ! -s windows.vmdk ]; then + echo "$0: test skipped because windows.vmdk was not created" + exit 77 +fi + +export VIRT_TOOLS_DATA_DIR="$top_srcdir/test-data/fake-virt-tools" + +d=test-...

...l 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 -o json. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped +skip_if_backend uml +skip_unless_phony_guest windows.img +skip_unless jq --version + +libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" + +export VIRT_TOOLS_DATA_DIR="$top_srcdir/test-data/fake-virt-tools" + +guestname=windows + +d=test-v2v-o-json.d +r...

...fish finds: +# 1. md device created from physical block device and LV(s), +# 2. md device created from LVs +# 3. VG created from md device(s) +# +# raid0 is used for md device because it is inoperable if one of its component is inaccessible. +# This covers rhbz1527852. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped + +disk1=lvm-on-md-devices-1.img +disk2=lvm-on-md-devices-2.img + +rm -f $disk1 $disk2 + +# Clean up if the script is killed or exits early +cleanup () +{ + status=$? + set +e + + # Don't delete the output files if non-zero exit + if [ "$status" -eq 0 ]; then rm -f $dis...

...test-data/phony-guests/blank-disk.img'/> <target dev='fda' /> </disk> </devices> diff --git a/tests/test-v2v-mac.sh b/tests/test-v2v-mac.sh index 9132fe2f..7e1d1047 100755 --- a/tests/test-v2v-mac.sh +++ b/tests/test-v2v-mac.sh @@ -25,7 +25,7 @@ skip_if_skipped skip_if_backend uml skip_unless_phony_guest windows.img -libvirt_uri="test://$abs_srcdir/test-v2v-mac.xml" +libvirt_uri="test://$abs_builddir/test-v2v-mac.xml" f=$top_builddir/test-data/phony-guests/windows.img export VIRT_TOOLS_DATA_DIR="$top_srcdir/test-data/fa...

Add a single shell script to hold results of configure. Pino Toscano (2): build: add an empty config.sh tests: switch to config.sh for xmllint .gitignore | 4 +--- config.sh.in | 22 +++++++++++++++++++ configure.ac | 7 +----- ...luks.sh.in => test-virt-inspector-luks.sh} | 2 +-

...e 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. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped + +skip_unless_backend libvirt + +./test-add-disks -n 255 diff --git a/tests/disks/test-27-disks.sh b/tests/disks/test-27-disks.sh new file mode 100755 index 000000000..c2cf7b223 --- /dev/null +++ b/tests/disks/test-27-disks.sh @@ -0,0 +1,26 @@ +#!/bin/bash +# Copyright (C) 2012-2017 Red Hat Inc...

--- tests/9p/test-9p.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tests/9p/test-9p.sh b/tests/9p/test-9p.sh index 748603037..b4bdbe56e 100755 --- a/tests/9p/test-9p.sh +++ b/tests/9p/test-9p.sh @@ -25,16 +25,18 @@ $TEST_FUNCTIONS skip_if_skipped skip_unless_backend direct -# The name of the virtio-9p device is different on virtio-pci and virtio-mmio. -arch="$(uname -m)" -if [[ "$arch" =~ ^arm ]]; then - virtio_mmio=yes -fi -if [ "$virtio_mmio" != "yes" ]; then - virtio_9p=virtio-9p-pci -e...

...if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Regression test for: +# https://bugzilla.redhat.com/show_bug.cgi?id=1477623 +# Check that the 'file' API doesn't break on some chardevs. + +set -e + +$TEST_FUNCTIONS +skip_if_skipped +skip_unless_phony_guest fedora.img + +d=rhbz1477623.img +rm -f $d + +guestfish -- \ + disk-create $d qcow2 -1 \ + backingfile:$top_builddir/test-data/phony-guests/fedora.img \ + backingformat:raw + +guestfish -a $d -i <<EOF + mkdir /dev + mknod-c 0777 5 1 /dev...

...+ > 1 file changed, 1 insertion(+) > > diff --git a/v2v/test-v2v-o-rhv-upload.sh b/v2v/test-v2v-o-rhv-upload.sh > index 8bda7cc0b..29214a9db 100755 > --- a/v2v/test-v2v-o-rhv-upload.sh > +++ b/v2v/test-v2v-o-rhv-upload.sh > @@ -28,6 +28,7 @@ set -x > $TEST_FUNCTIONS > skip_if_skipped > skip_if_backend uml > +skip_unless nbdkit file --version > skip_unless_phony_guest windows.img > > libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" ACK. We could also skip if Python is not available, or one of the Python modules like the...

...> 1 file changed, 2 insertions(+) > > diff --git a/v2v/test-v2v-o-rhv-upload.sh b/v2v/test-v2v-o-rhv-upload.sh > index 8bda7cc0b..23d2ad7a0 100755 > --- a/v2v/test-v2v-o-rhv-upload.sh > +++ b/v2v/test-v2v-o-rhv-upload.sh > @@ -28,6 +28,8 @@ set -x > $TEST_FUNCTIONS > skip_if_skipped > skip_if_backend uml > +skip_unless python3 --version > +skip_unless nbdkit python3 --version > skip_unless_phony_guest windows.img > > libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" This will only work on Fedora because Fedora renames...