On 12/15/23 13:33, Peter Krempa wrote:
> There were plenty of test cases invoked only from qemuxml2xmltest but
> not from qemuxml2argvtest, either by accident or it was deemed unneeded.
>
> Bulk-add all test cases which fit the above description which don't
> require faking the network driver. Use same invocation as present in
> qemuxml2xmltest.
>
> Arguably in certain cases we could move the test case to
> genericxml2xmltest, but this covers the cases when that would not be
> appropriate.
>
> Tests requiring the network driver will be bulk-added when the fake
> network driver will be implemented.
>
> This patch also allows the use of FLAG_SKIP_CONFIG_ACTIVE in
> qemuxml2argvtest although the flag will be dormant for now.
>
> Signed-off-by: Peter Krempa <pkrempa@xxxxxxxxxx>
> ---
> ...nu-disable-with-timeout.x86_64-latest.args | 36 +++++++++++
> ...hannel-unix-source-path.x86_64-latest.args | 45 ++++++++++++++
> .../chardev-label.x86_64-latest.args | 41 +++++++++++++
> .../console-compat2.x86_64-latest.args | 40 +++++++++++++
> .../cpu-empty.x86_64-latest.args | 33 ++++++++++
> ...cpu-host-model-features.x86_64-latest.args | 33 ++++++++++
> .../cpu-numa-disordered.x86_64-latest.args | 38 ++++++++++++
> .../disk-active-commit.x86_64-latest.args | 38 ++++++++++++
> .../disk-mirror-old.x86_64-latest.args | 45 ++++++++++++++
> .../disk-mirror.x86_64-latest.args | 48 +++++++++++++++
> .../disk-network-vxhs.x86_64-5.0.0.args | 35 +++++++++++
> .../downscript.x86_64-latest.args | 43 +++++++++++++
> .../hostdev-mdev-display.x86_64-latest.args | 34 +++++++++++
> ...ev-scsi-autogen-address.x86_64-latest.args | 60 +++++++++++++++++++
> ...hostdev-scsi-large-unit.x86_64-latest.args | 39 ++++++++++++
> .../hostdev-scsi-shareable.x86_64-latest.args | 39 ++++++++++++
> .../qemuxml2argvdata/lease.x86_64-latest.args | 39 ++++++++++++
> .../memorybacking-set.x86_64-latest.args | 33 ++++++++++
> .../memorybacking-unset.x86_64-latest.args | 33 ++++++++++
> .../metadata-duplicate.x86_64-latest.args | 36 +++++++++++
> .../metadata.x86_64-latest.args | 36 +++++++++++
> .../net-midonet.x86_64-latest.args | 38 ++++++++++++
> ...d-auto-vcpu-no-numatune.x86_64-latest.args | 36 +++++++++++
> ...static-vcpu-no-numatune.x86_64-latest.args | 36 +++++++++++
> ...vcpus-topology-mismatch.x86_64-latest.args | 34 +++++++++++
> .../panic-pseries.ppc64-latest.args | 34 +++++++++++
> .../pcihole64-gib.x86_64-latest.args | 34 +++++++++++
> .../s390-defaultconsole.s390x-latest.args | 33 ++++++++++
> .../s390-panic.s390x-latest.args | 35 +++++++++++
> ...eclabel-device-multiple.x86_64-latest.args | 36 +++++++++++
> ...el-dynamic-none-relabel.x86_64-latest.args | 37 ++++++++++++
> .../seclabel-dynamic-none.x86_64-latest.args | 36 +++++++++++
> ...serial-target-port-auto.x86_64-latest.args | 42 +++++++++++++
> .../vhost-user-fs-sock.x86_64-latest.args | 34 +++++++++++
> ...ideo-virtio-gpu-ccw-auto.s390x-latest.args | 36 +++++++++++
> tests/qemuxml2argvtest.c | 39 ++++++++++++
> 36 files changed, 1364 insertions(+)
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index a5dce0a2a1..06fdd02b76 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -274,6 +274,7 @@ testCheckExclusiveFlags(int flags)
> FLAG_REAL_CAPS |
> FLAG_SLIRP_HELPER |
> FLAG_ALLOW_DUPLICATE_OUTPUT |
> + FLAG_SKIP_CONFIG_ACTIVE |
> 0, -1);
>
> return 0;
> @@ -2441,6 +2442,44 @@ mymain(void)
> DO_TEST_CAPS_ARCH_LATEST("s390-async-teardown-disabled", "s390x");
> DO_TEST_CAPS_ARCH_VER("s390-async-teardown-disabled", "s390x", "6.0.0");
>
> + /* following cases are instances from qemuxml2xmltest which were not tested
> + * in qemuxml2argvtest */
I'd remove this comment. While it is true, it may happen that a
contributor will add new test case (e.g. while implementing new xml
knob) and add a test case here...
> + DO_TEST_CAPS_LATEST("boot-menu-disable-with-timeout");
> + DO_TEST_CAPS_LATEST("channel-unix-source-path");
> + DO_TEST_CAPS_LATEST("chardev-label");
> + DO_TEST_CAPS_LATEST("console-compat2");
> + DO_TEST_CAPS_LATEST("cpu-empty");
> + DO_TEST_CAPS_LATEST("cpu-host-model-features");
> + DO_TEST_CAPS_LATEST("cpu-numa-disordered");
> + DO_TEST_CAPS_LATEST("disk-active-commit");
> + DO_TEST_CAPS_LATEST("disk-mirror-old");
> + DO_TEST_CAPS_LATEST("disk-mirror");
> + DO_TEST_CAPS_VER("disk-network-vxhs", "5.0.0");
> + DO_TEST_CAPS_LATEST("downscript");
> + DO_TEST_CAPS_LATEST("hostdev-mdev-display");
> + DO_TEST_CAPS_LATEST("hostdev-scsi-autogen-address");
> + DO_TEST_CAPS_LATEST("hostdev-scsi-large-unit");
> + DO_TEST_CAPS_LATEST("hostdev-scsi-shareable");
> + DO_TEST_CAPS_LATEST("lease");
> + DO_TEST_CAPS_LATEST("memorybacking-set");
> + DO_TEST_CAPS_LATEST("memorybacking-unset");
> + DO_TEST_CAPS_LATEST("metadata-duplicate");
> + DO_TEST_CAPS_LATEST("metadata");
> + DO_TEST_CAPS_LATEST("net-midonet");
> + DO_TEST_CAPS_LATEST("numad-auto-vcpu-no-numatune");
> + DO_TEST_CAPS_LATEST("numad-static-vcpu-no-numatune");
> + DO_TEST_CAPS_LATEST("numavcpus-topology-mismatch");
> + DO_TEST_CAPS_ARCH_LATEST("panic-pseries", "ppc64");
> + DO_TEST_CAPS_LATEST("pcihole64-gib");
> + DO_TEST_CAPS_ARCH_LATEST("s390-defaultconsole", "s390x");
> + DO_TEST_CAPS_ARCH_LATEST("s390-panic", "s390x");
> + DO_TEST_CAPS_LATEST("seclabel-device-multiple");
> + DO_TEST_CAPS_ARCH_LATEST_FULL("seclabel-dynamic-none-relabel", "x86_64", ARG_FLAGS, FLAG_SKIP_CONFIG_ACTIVE, ARG_END);
> + DO_TEST_CAPS_LATEST("seclabel-dynamic-none");
> + DO_TEST_CAPS_LATEST("serial-target-port-auto");
> + DO_TEST_CAPS_LATEST("vhost-user-fs-sock");
> + DO_TEST_CAPS_ARCH_LATEST("video-virtio-gpu-ccw-auto", "s390x");
> +
> qemuTestDriverFree(&driver);
> virFileWrapperClearPrefixes();
>
Michal
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
