search for: skip_if_backend

...t a/tests/regressions/rhbz690819.sh b/tests/regressions/rhbz690819.sh index d18b4d81a..0b790862d 100755 --- a/tests/regressions/rhbz690819.sh +++ b/tests/regressions/rhbz690819.sh @@ -29,6 +29,7 @@ skip_if_arch arm skip_if_arch aarch64 skip_if_arch ppc64 skip_if_arch ppc64le +skip_if_arch s390x skip_if_backend libvirt # UML doesn't support the 'iface' parameter. skip_if_backend uml diff --git a/tests/regressions/rhbz975797.sh b/tests/regressions/rhbz975797.sh index bc6a1c63f..04e8d23de 100755 --- a/tests/regressions/rhbz975797.sh +++ b/tests/regressions/rhbz975797.sh @@ -29,6 +29,7 @@ skip_...

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.

...est-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

...t-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

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.

...sts/blank-disk.img'/> <target dev='hdb' bus='ide'/> </disk> </devices> diff --git a/tests/test-v2v-cdrom.sh b/tests/test-v2v-cdrom.sh index 8adc5103..9915f8ac 100755 --- a/tests/test-v2v-cdrom.sh +++ b/tests/test-v2v-cdrom.sh @@ -27,7 +27,7 @@ skip_if_backend uml skip_unless_phony_guest windows.img skip_unless_phony_guest blank-disk.img -libvirt_uri="test://$abs_srcdir/test-v2v-cdrom.xml" +libvirt_uri="test://$abs_builddir/test-v2v-cdrom.xml" export VIRT_TOOLS_DATA_DIR="$top_srcdir/test-data/fake-virt-tools" export VI...

...r)/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_builddir/blank-part.im...

...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-v2v-i-ova-bad-sha1.d...

Fix one dist issue, and almost all the builddir!=srcdir issues. (For the record, only 3 tests still fail in that setup.) Pino Toscano (3): libvirt-ocaml: add libvirt_c.h as source tests: fix path to sources of fake-virtio-win.iso tests: fix srcdir references bundled/libvirt-ocaml/Makefile.am | 1 + test-data/fake-virtio-win/Makefile.am | 2 +- tests/rhbz1232192.sh

...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 +rm -rf $d +mkdir $d +...

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

v2: - 1/3: same as in previous version - 2/3: add check for libvirt version - 3/3: restore the disabled test The libvirt patch [2] that should fix our problem with 'raw' driver that is mentioned in [1] was merged. To realy fix things, there is at least one thing we have to change on our side. We have to be explicit about the driver in the JSON we generate. [1]

..., 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 HTTP server is not availa...

...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 the upstream nbdkit pyth...

...upload.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-v2v-o-rhv-upload.sh b/tests/test-v2v-o-rhv-upload.sh index a2f5b0d5..fe0a4d94 100755 --- a/tests/test-v2v-o-rhv-upload.sh +++ b/tests/test-v2v-o-rhv-upload.sh @@ -29,7 +29,7 @@ $TEST_FUNCTIONS skip_if_skipped skip_if_backend uml skip_unless python3 --version -skip_unless nbdkit python3 --version +skip_unless nbdkit python --version skip_unless_phony_guest windows.img libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" -- 2.21.0

...NBDKIT_PYTHON_PLUGIN="@VIRT_V2V_NBDKIT_PYTHON_PLUGIN@" diff --git a/tests/test-v2v-o-rhv-upload.sh b/tests/test-v2v-o-rhv-upload.sh index a2f5b0d5..e70575c7 100755 --- a/tests/test-v2v-o-rhv-upload.sh +++ b/tests/test-v2v-o-rhv-upload.sh @@ -29,7 +29,7 @@ $TEST_FUNCTIONS skip_if_skipped skip_if_backend uml skip_unless python3 --version -skip_unless nbdkit python3 --version +skip_unless nbdkit $VIRT_V2V_NBDKIT_PYTHON_PLUGIN --version skip_unless_phony_guest windows.img libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" -- 2.23.0

...ifferent filesystem for this test, or # delete the test if we are confident that all common filesystems are # supported. -# -# The reason why vfat is significant is because UEFI guests use it. set -e set -x @@ -36,13 +34,14 @@ $TEST_FUNCTIONS skip_if_skipped # UML does not support discard. skip_if_backend uml +skip_unless_filesystem_available minix img=test-virt-sparsify-in-place-fstrim-unsupported.img log=test-virt-sparsify-in-place-fstrim-unsupported.log rm -f $img $log -# Create a test filesystem with a single vfat filesystem. -guestfish -N $img=fs:vfat exit +# Create a test filesystem wit...

This addresses the feedback on v1 here: https://www.redhat.com/archives/libguestfs/2018-September/msg00023.html Rich.

...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 >...

...to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Test -o rhv-upload. +# +# These uses a test harness (see +# v2v/test-v2v-o-rhv-upload-module/ovirtsdk4) to fake responses from +# oVirt. + +set -e +set -x + +$TEST_FUNCTIONS +skip_if_skipped +skip_if_backend uml +skip_unless_phony_guest windows.img + +libvirt_uri="test://$abs_top_builddir/test-data/phony-guests/guests.xml" +f=$top_builddir/test-data/phony-guests/windows.img + +export VIRT_TOOLS_DATA_DIR="$top_srcdir/test-data/fake-virt-tools" +export VIRTIO_WIN="$top_srcdir/tes...