[PATCH 18/21] tests: vmx: Make paths in test files conform with the XML schema

[Pino Toscano]

On Thursday, 8 October 2020 09:55:32 CEST Peter Krempa wrote:
> The vmx tests use fake paths for files which in some cases didn't start
> with a /. Since libvirt's schema mandates full paths and the
> representation used in the tests is only internal to the tests we'll add
> a leading / to the paths to conform to the schema.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml   | 2 +-
>  tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml   | 2 +-
>  tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml       | 2 +-
>  tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml      | 2 +-
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml    | 6 +++---
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml    | 6 +++---
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml    | 8 ++++----
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml    | 4 ++--
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml    | 6 +++---
>  tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-floppy-file.xml          | 4 ++--
>  tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml | 2 +-
>  tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml   | 2 +-
>  tests/vmx2xmldata/vmx2xml-harddisk-transient.xml   | 2 +-
>  tests/vmx2xmldata/vmx2xml-parallel-file.xml        | 2 +-
>  tests/vmx2xmldata/vmx2xml-scsi-driver.xml          | 8 ++++----
>  tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml    | 2 +-
>  tests/vmx2xmldata/vmx2xml-serial-file.xml          | 4 ++--
>  tests/vmx2xmltest.c                                | 4 ++--
>  tests/xml2vmxdata/xml2vmx-cdrom-ide-file.xml       | 2 +-
>  tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.xml      | 2 +-
>  tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.xml    | 6 +++---
>  tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.xml    | 6 +++---
>  tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml    | 8 ++++----
>  tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml    | 4 ++--
>  tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-esx-in-the-wild-7.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-esx-in-the-wild-9.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-floppy-file.xml          | 4 ++--
>  tests/xml2vmxdata/xml2vmx-fusion-in-the-wild-1.xml | 2 +-
>  tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-harddisk-ide-file.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.xml   | 2 +-
>  tests/xml2vmxdata/xml2vmx-parallel-file.xml        | 2 +-
>  tests/xml2vmxdata/xml2vmx-scsi-driver.xml          | 8 ++++----
>  tests/xml2vmxdata/xml2vmx-scsi-writethrough.xml    | 2 +-
>  tests/xml2vmxdata/xml2vmx-serial-file.xml          | 2 +-
>  tests/xml2vmxtest.c                                | 4 ++--
>  50 files changed, 79 insertions(+), 79 deletions(-)
> 
> diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
> index 7cb6413941..97fa300c18 100644
> --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
> +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
> @@ -16,7 +16,7 @@
>    <on_crash>destroy</on_crash>
>    <devices>
>      <disk type='file' device='disk'>
> -      <source file='[datastore] directory/FEDORA11.VMDK'/>
> +      <source file='/[datastore] directory/FEDORA11.VMDK'/>

The real XMLs of VMware guests have disks paths like
'[datastore] path/to/file.vmx'. The proposed change will make these
XMLs unusable as real XMLs, and some of them were actually real XMLs.

Even if these files are just tests, I don't think this is correct to
make them different than real XMLs.

If the schema does not support file='[datastore] path/to/file.vmx',
IMHO that's the schema itself what needs to be fixed, not example/test
XMLs...

-- 
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/libvir-list/attachments/20201008/3d3934c2/attachment-0001.sig>