similar to: [PATCH v2] v2v: -o rhv-upload: test-v2v-o-rhv-upload.sh: add more skip checks

-o rhv-upload requires nbdkit, so skip this test if it is not installed. --- 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

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

On Mon, Oct 01, 2018 at 04:40:19PM +0200, Pino Toscano wrote: > -o rhv-upload requires python3, and nbdkit with the python3 plugin, so > skip this test if they are not installed. > --- > > v1 is: > https://www.redhat.com/archives/libguestfs/2018-October/msg00008.html > > v2v/test-v2v-o-rhv-upload.sh | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git

On Mon, Oct 01, 2018 at 01:47:06PM +0200, Pino Toscano wrote: > -o rhv-upload requires nbdkit, so skip this test if it is not installed. > --- > 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 > +++

With recent nbdkit the skip test fails the rhv-upload test skip: $ nbdkit python3 --version nbdkit: error: cannot open plugin 'python3': /usr/local/lib/nbdkit/plugins/nbdkit-python3-plugin.so: cannot open shared object file: No such file or directory It seems that the python plugin is always installed as nbdkit-python-plugin.so, so the correct test now is: nbdkit

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.

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

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.

Add the configure result in config.sh, so it can be used as variable. --- config.sh.in | 2 ++ tests/test-v2v-o-rhv-upload.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config.sh.in b/config.sh.in index 061871a3..f3245379 100644 --- a/config.sh.in +++ b/config.sh.in @@ -18,3 +18,5 @@ # This shell script contains the results of some configure checks,

This adds a test of -o rhv-upload. Obviously for an upstream test we cannot require a working oVirt server. This test works by faking the ovirtsdk4 Python module, setting PYTHONPATH so that the fake module is picked up instead of the real module (if installed). However it's more complex than that because the nbdkit plugin also expects to talk to a working imageio HTTPS server. Therefore

Followup of commit f190e08d85556dac293ef15bfeee38e54471570f. --- v2v/Makefile.am | 2 ++ v2v/test-v2v-o-json.sh | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100755 v2v/test-v2v-o-json.sh diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 39511022e..1c37d20b4 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -468,6 +468,7 @@ TESTS

v1 was here: https://www.redhat.com/archives/libguestfs/2018-September/msg00121.html v2: - Rewrote patch 2 from scratch so it incorporates Nir's suggestions. - Add fake module to EXTRA_DIST. - Retested. Unfortunately I am no longer able to test the ordinary conversion path because ovirtsdk4 is incompatible with Fedora 29 / Python 3.7:

Instead of using the "global" blank-part test image, use a local version of it created with guestfish. --- p2v/.gitignore | 1 + p2v/Makefile.am | 7 ++++++- p2v/test-virt-p2v-nbdkit.sh | 4 ++-- p2v/test-virt-p2v.sh | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/p2v/.gitignore b/p2v/.gitignore index 673e8ad83..8495f6c2f 100644

Add the missing objects, methods, variables, and relations among the various objects. Followup/fixes commit c49aa4fe01aac82d4776dd2a3524ce16e6deed06, and commit 8118f28b6ff93c11f92fd65873285c2eba10ea0a. --- .../ovirtsdk4/__init__.py | 25 +++++++++++++------ .../ovirtsdk4/types.py | 19 ++++++++++---- 2 files changed, 31 insertions(+), 13 deletions(-)

Previously this output method was almost completely untested. This commit adds a fake ovirtsdk4 module so we can test the -o rhv-upload method fairly completely without needing an actual oVirt instance around. --- v2v/Makefile.am | 4 + .../ovirtsdk4/__init__.py | 146 ++++++++++++++++++ .../ovirtsdk4/types.py | 125

As preliminary steps in splitting virt-p2v to an own repository, start making p2v more independent within libguestfs. This is accomplished by the following changes: - generate the p2v kernel config sources & docs at build time using a Perl script, rather than the generator (so no need for OCaml when building from git, and no generated sources in dist tarballs) - create two local test

On Fri, Dec 7, 2018, 10:34 Richard W.M. Jones <rjones@redhat.com wrote: > On Fri, Dec 07, 2018 at 02:44:21AM +0200, Nir Soffer wrote: > > Fix rhv-cafile option access, broken by commit 6694028f9827 (v2v: -o > > rhv-upload: Only set SSL context for https connections). > > Ugh yes indeed. Strong typing FTW _again_ "pylint -E" may detect such issues. ... >

On Thu, Sep 20, 2018 at 11:51 AM Richard W.M. Jones <rjones@redhat.com> wrote: > Previously this output method was almost completely untested. > > This commit adds a fake ovirtsdk4 module so we can test the > -o rhv-upload method fairly completely without needing an actual > oVirt instance around. > --- > v2v/Makefile.am | 4 + >

Do not assume that the Python plugin of nbdkit has the same name of the Python interpreter. Use the default upstream name of nbdkit to identify it; downstream distributions must adjust this variable, in case they rename the Python plugin of nbdkit. --- v2v/output_rhv_upload.ml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/v2v/output_rhv_upload.ml

For interest only, here is the patch required to make -o rhv-upload work with Python 2 (for RHEL 7). I don't think we want this upstream. A couple of remarks: * It's supposed to be possible to add ‘coding: utf-8’ to the top of .py files to make Python 2 accept that the file is UTF-8 (otherwise it gives an error on loading). However I added this and it didn't appear to make any