[libvirt] [PATCH 18/24] tests: qemuxml2argv: Unify testing of 'disk-network-rbd'

[Ján Tomko]

On Thu, Jul 19, 2018 at 05:51:10PM +0200, Peter Krempa wrote:
>Move the authentication and ipv6 cases into the main test file. To allow
>removal of the separate testing of the secure credential passing via the
>'secret' object in qemu, use the DO_TEST_CAPS_VER macro with version
>2.5.0 when the secret object is not supported by qemu.
>
>Signed-off-by: Peter Krempa <pkrempa at redhat.com>
>---
> .../disk-network-rbd-auth-AES.args                 | 47 -----------------
> .../qemuxml2argvdata/disk-network-rbd-auth-AES.xml | 55 -------------------
> tests/qemuxml2argvdata/disk-network-rbd-auth.args  | 32 ------------
> tests/qemuxml2argvdata/disk-network-rbd-auth.xml   | 42 ---------------
> tests/qemuxml2argvdata/disk-network-rbd-ipv6.args  | 31 -----------
> tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml   | 40 --------------
> tests/qemuxml2argvdata/disk-network-rbd.args       | 44 ----------------
> .../disk-network-rbd.x86_64-2.5.0.args             | 55 +++++++++++++++++++
> .../disk-network-rbd.x86_64-latest.args            | 61 ++++++++++++++++++++++
> tests/qemuxml2argvdata/disk-network-rbd.xml        | 28 +++++++---
> tests/qemuxml2argvtest.c                           |  9 ++--
> tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml | 47 -----------------
> tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml | 45 ----------------
> tests/qemuxml2xmloutdata/disk-network-rbd.xml      | 30 ++++++++---
> tests/qemuxml2xmltest.c                            |  2 -
> 15 files changed, 165 insertions(+), 403 deletions(-)
> delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth-AES.args
> delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth-AES.xml
> delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth.args
> delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-auth.xml
> delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ipv6.args
> delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-ipv6.xml
> delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.args
> create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
> create mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
> delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-auth.xml
> delete mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-ipv6.xml
>

Reviewed-by: Ján Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20180723/0b0be73b/attachment-0001.sig>