[Libguestfs] [PATCH] v2v: -o rhv-upload: skip test-v2v-o-rhv-upload.sh w/o nbdkit

Pino Toscano ptoscano at redhat.com
Mon Oct 1 13:03:49 UTC 2018


On Monday, 1 October 2018 14:28:02 CEST Richard W.M. Jones wrote:
> 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
> > +++ 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

Or I guess I can check for the python module, although nothing says
whether it was built for Python 2 or 3...

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

Good idea, I will amend send a v2 with this.

> or one of the Python modules like the HTTP server is not available.

http.server seems new in CPython 3, so no check is needed.

-- 
Pino Toscano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part.
URL: <http://listman.redhat.com/archives/libguestfs/attachments/20181001/9f31679f/attachment.sig>


More information about the Libguestfs mailing list