[libvirt] [PATCH 10/11] tests: Integrate startup checks to qemuxml2argvtest

[Ján Tomko]

On Thu, Feb 04, 2016 at 03:49:47PM +0100, Peter Krempa wrote:
> Some of the tests that are not a part of qemuBuildCommandLine were not
> executed in the test suite. We can now reuse qemuProcessStartValidate to
> integrate these tests.
> ---
>  tests/qemuxml2argvtest.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index a5d4722..af6f9a5 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -18,6 +18,7 @@
>  # include "qemu/qemu_command.h"
>  # include "qemu/qemu_domain.h"
>  # include "qemu/qemu_migration.h"
> +# include "qemu/qemu_process.h"
>  # include "datatypes.h"
>  # include "conf/storage_conf.h"
>  # include "cpu/cpu_map.h"
> @@ -262,6 +263,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
>      virCommandPtr cmd = NULL;
>      size_t i;
>      virBitmapPtr nodeset = NULL;
> +    bool buildFailed = false;
> 
>      if (!(conn = virGetConnect()))
>          goto out;
> @@ -339,13 +341,20 @@ static int testCompareXMLToArgvFiles(const char *xml,
>              goto out;
>      }
> 
> -    if (!(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr,
> +    if (qemuProcessStartValidate(vmdef, extraFlags, !!migrateURI, false) < 0)
> +        buildFailed = true;

The variable is called 'buildFailed' even though we did not get to the
Build part yet. How about testFailed?

> +
> +    if (!buildFailed &&
> +        !(cmd = qemuBuildCommandLine(conn, &driver, vmdef, &monitor_chr,
>                                       (flags & FLAG_JSON), extraFlags,
>                                       migrateURI, NULL,
>                                       VIR_NETDEV_VPORT_PROFILE_OP_NO_OP,
>                                       &testCallbacks, false,
>                                       (flags & FLAG_FIPS),
> -                                     nodeset, NULL, NULL))) {
> +                                     nodeset, NULL, NULL)))
> +        buildFailed = true;
> +
> +    if (buildFailed) {
>          if (!virtTestOOMActive() &&
>              (flags & FLAG_EXPECT_FAILURE)) {
>              ret = 0;

This message:
    VIR_TEST_DEBUG("qemuBuildCommandLine should have failed\n");
also needs to be rewritten.

ACK with that fixed.

Jan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20160206/8488c440/attachment-0001.sig>