Re: [libvirt] [PATCH 3/4] qemuxml2argvtest: drop FLAG_EXPECT_ERROR

It is only used for failed address allocation Since we already have FLAG_EXPECT_FAILURE, use that instead. --- tests/qemuxml2argvtest.c | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 975e358..2a57176 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c

@@ -354,20 +353,15 @@ static int testCompareXMLToArgvFiles(const char *xml, ret = 0; ok: - if (ret == 0 && - ((flags & FLAG_EXPECT_ERROR) || - (flags & FLAG_EXPECT_FAILURE))) { + if (ret == 0 && flags & FLAG_EXPECT_FAILURE) { ret = -1; VIR_TEST_DEBUG("Error expected but there wasn't any.\n"); goto out; } if (!virtTestOOMActive()) { - if (flags & FLAG_EXPECT_ERROR) { + if (flags & FLAG_EXPECT_FAILURE) { if ((log = virtTestLogContentAndReset())) VIR_TEST_DEBUG("Got expected error: \n%s", log); - } else if (flags & FLAG_EXPECT_FAILURE) { - VIR_TEST_DEBUG("Got expected failure: %s\n", - virGetLastErrorMessage());