Pino Toscano
2013-Dec-06 14:00 UTC
[Libguestfs] [PATCH] builder: adapt test-virt-builder-list.sh output expectation
ee0e56f43e55307fefa1d04505ed6477d604d220 slightly changes the output of --list but test-virt-builder-list.sh has not been updated accordingly. Adapting the expected output makes test-virt-builder-list.sh pass again. --- builder/test-virt-builder-list.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/test-virt-builder-list.sh b/builder/test-virt-builder-list.sh index 11305a9..ea4f561 100755 --- a/builder/test-virt-builder-list.sh +++ b/builder/test-virt-builder-list.sh @@ -41,7 +41,7 @@ long_list=$(./virt-builder --no-check-signature --no-cache --list --long) if [ "$long_list" != "Source URI: $VIRT_BUILDER_SOURCE Fingerprint: F777 4FB1 AD07 4A7E 8C87 67EA 9173 8F73 E1B7 68A0 -os-version: phony-debian +OS version: phony-debian Full name: Phony Debian Minimum/default size: 512.0M @@ -49,7 +49,7 @@ Notes: Phony Debian look-alike used for testing. -os-version: phony-fedora +OS version: phony-fedora Full name: Phony Fedora Minimum/default size: 1.0G @@ -57,7 +57,7 @@ Notes: Phony Fedora look-alike used for testing. -os-version: phony-ubuntu +OS version: phony-ubuntu Full name: Phony Ubuntu Minimum/default size: 512.0M @@ -65,7 +65,7 @@ Notes: Phony Ubuntu look-alike used for testing. -os-version: phony-windows +OS version: phony-windows Full name: Phony Windows Minimum/default size: 512.0M -- 1.8.3.1
Richard W.M. Jones
2013-Dec-06 14:51 UTC
Re: [Libguestfs] [PATCH] builder: adapt test-virt-builder-list.sh output expectation
On Fri, Dec 06, 2013 at 03:00:41PM +0100, Pino Toscano wrote:> ee0e56f43e55307fefa1d04505ed6477d604d220 slightly changes the output of > --list but test-virt-builder-list.sh has not been updated accordingly. > > Adapting the expected output makes test-virt-builder-list.sh pass again.> -os-version: phony-debian > +OS version: phony-debianNow I look at this, it's not "OS version" (operating system version). It's literally the string "os-version". See the man page: http://libguestfs.org/virt-builder.1.html#synopsis So I think the original change is wrong :-( Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://people.redhat.com/~rjones/virt-top
Pino Toscano
2013-Dec-06 16:27 UTC
Re: [Libguestfs] [PATCH] builder: adapt test-virt-builder-list.sh output expectation
On Friday 06 December 2013 14:51:41 Richard W.M. Jones wrote:> On Fri, Dec 06, 2013 at 03:00:41PM +0100, Pino Toscano wrote: > > ee0e56f43e55307fefa1d04505ed6477d604d220 slightly changes the output > > of --list but test-virt-builder-list.sh has not been updated > > accordingly. > > > > Adapting the expected output makes test-virt-builder-list.sh pass > > again. > > > > -os-version: phony-debian > > +OS version: phony-debian > > Now I look at this, it's not "OS version" (operating system version). > It's literally the string "os-version". See the man page: > > http://libguestfs.org/virt-builder.1.html#synopsis > > So I think the original change is wrong :-(Oops, sorry again for the small issue, and thanks for having reverted that string change. -- Pino Toscano