External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-06 00:43:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

genericxml2xmltest: Substitute 'inactive' variable with 'active'

Browse Source 
Having negation in a name of a bool variable seems a bit
confusing to me. I think the substitution makes the code much
more readable.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2021-07-21 09:57:45 +02:00 committed by Michal Privoznik
parent c4caa1e736
commit 0f4a65874a
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tests/genericxml2xmltest.c
View File

@ -18,7 +18,7 @@ static virDomainXMLOption *xmlopt;
struct testInfo { struct testInfo {
const char *name; const char *name;
int different; int different;
bool inactive_only; bool active_only;
testCompareDomXML2XMLResult expectResult; testCompareDomXML2XMLResult expectResult;
}; };
@ -37,7 +37,7 @@ testCompareXMLToXMLHelper(const void *data)
ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in, ret = testCompareDomXML2XMLFiles(caps, xmlopt, xml_in,
info->different ? xml_out : xml_in, info->different ? xml_out : xml_in,
!info->inactive_only, 0, info->active_only, 0,
info->expectResult); info->expectResult);
VIR_FREE(xml_in); VIR_FREE(xml_in);
VIR_FREE(xml_out); VIR_FREE(xml_out);
@ -138,9 +138,9 @@ mymain(void)
if (!(xmlopt = virTestGenericDomainXMLConfInit())) if (!(xmlopt = virTestGenericDomainXMLConfInit()))
return EXIT_FAILURE; return EXIT_FAILURE;
#define DO_TEST_FULL(name, is_different, inactive, expectResult) \ #define DO_TEST_FULL(name, is_different, active, expectResult) \
do { \ do { \
const struct testInfo info = {name, is_different, inactive, \ const struct testInfo info = {name, is_different, active, \
expectResult}; \ expectResult}; \
if (virTestRun("GENERIC XML-2-XML " name, \ if (virTestRun("GENERIC XML-2-XML " name, \
testCompareXMLToXMLHelper, &info) < 0) \ testCompareXMLToXMLHelper, &info) < 0) \
@ -148,10 +148,10 @@ mymain(void)
} while (0) } while (0)
#define DO_TEST(name) \ #define DO_TEST(name) \
DO_TEST_FULL(name, 0, false, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS) DO_TEST_FULL(name, 0, true, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS)
#define DO_TEST_DIFFERENT(name) \ #define DO_TEST_DIFFERENT(name) \
DO_TEST_FULL(name, 1, false, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS) DO_TEST_FULL(name, 1, true, TEST_COMPARE_DOM_XML2XML_RESULT_SUCCESS)
DO_TEST_DIFFERENT("disk-virtio"); DO_TEST_DIFFERENT("disk-virtio");
DO_TEST_DIFFERENT("disk-hyperv-physical"); DO_TEST_DIFFERENT("disk-hyperv-physical");
@ -162,18 +162,18 @@ mymain(void)
DO_TEST_DIFFERENT("graphics-vnc-socket"); DO_TEST_DIFFERENT("graphics-vnc-socket");
DO_TEST_DIFFERENT("graphics-vnc-socket-listen"); DO_TEST_DIFFERENT("graphics-vnc-socket-listen");
DO_TEST_DIFFERENT("graphics-listen-back-compat"); DO_TEST_DIFFERENT("graphics-listen-back-compat");
DO_TEST_FULL("graphics-listen-back-compat-mismatch", 0, false, DO_TEST_FULL("graphics-listen-back-compat-mismatch", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_DIFFERENT("graphics-vnc-listen-attr-only"); DO_TEST_DIFFERENT("graphics-vnc-listen-attr-only");
DO_TEST_DIFFERENT("graphics-vnc-listen-element-minimal"); DO_TEST_DIFFERENT("graphics-vnc-listen-element-minimal");
DO_TEST_DIFFERENT("graphics-vnc-listen-element-with-address"); DO_TEST_DIFFERENT("graphics-vnc-listen-element-with-address");
DO_TEST_DIFFERENT("graphics-vnc-socket-attr-listen-address"); DO_TEST_DIFFERENT("graphics-vnc-socket-attr-listen-address");
DO_TEST_DIFFERENT("graphics-vnc-socket-attr-listen-socket"); DO_TEST_DIFFERENT("graphics-vnc-socket-attr-listen-socket");
DO_TEST_FULL("graphics-vnc-socket-attr-listen-socket-mismatch", 0, false, DO_TEST_FULL("graphics-vnc-socket-attr-listen-socket-mismatch", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST("graphics-vnc-autoport-no"); DO_TEST("graphics-vnc-autoport-no");
DO_TEST_FULL("name-slash-fail", 0, false, DO_TEST_FULL("name-slash-fail", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST("perf"); DO_TEST("perf");
@ -188,46 +188,46 @@ mymain(void)
DO_TEST("network-interface-mac-check"); DO_TEST("network-interface-mac-check");
DO_TEST_DIFFERENT("chardev-tcp"); DO_TEST_DIFFERENT("chardev-tcp");
DO_TEST_FULL("chardev-tcp-missing-host", 0, false, DO_TEST_FULL("chardev-tcp-missing-host", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("chardev-tcp-missing-service", 0, false, DO_TEST_FULL("chardev-tcp-missing-service", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("chardev-tcp-multiple-source", 0, false, DO_TEST_FULL("chardev-tcp-multiple-source", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_DIFFERENT("chardev-udp"); DO_TEST_DIFFERENT("chardev-udp");
DO_TEST_FULL("chardev-udp-missing-connect-service", 0, false, DO_TEST_FULL("chardev-udp-missing-connect-service", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("chardev-udp-multiple-source", 0, false, DO_TEST_FULL("chardev-udp-multiple-source", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_DIFFERENT("chardev-unix"); DO_TEST_DIFFERENT("chardev-unix");
DO_TEST_FULL("chardev-unix-smartcard-missing-path", 0, false, DO_TEST_FULL("chardev-unix-smartcard-missing-path", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("chardev-unix-redirdev-missing-path", 0, false, DO_TEST_FULL("chardev-unix-redirdev-missing-path", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("chardev-unix-rng-missing-path", 0, false, DO_TEST_FULL("chardev-unix-rng-missing-path", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_DIFFERENT("chardev-reconnect"); DO_TEST_DIFFERENT("chardev-reconnect");
DO_TEST_FULL("chardev-reconnect-missing-timeout", 0, false, DO_TEST_FULL("chardev-reconnect-missing-timeout", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("chardev-reconnect-invalid-mode", 0, false, DO_TEST_FULL("chardev-reconnect-invalid-mode", 0, true,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST("cachetune-small"); DO_TEST("cachetune-small");
DO_TEST("cachetune-cdp"); DO_TEST("cachetune-cdp");
DO_TEST("cachetune"); DO_TEST("cachetune");
DO_TEST_DIFFERENT("cachetune-extra-tunes"); DO_TEST_DIFFERENT("cachetune-extra-tunes");
DO_TEST_FULL("cachetune-colliding-allocs", false, true, DO_TEST_FULL("cachetune-colliding-allocs", false, false,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("cachetune-colliding-tunes", false, true, DO_TEST_FULL("cachetune-colliding-tunes", false, false,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("cachetune-colliding-types", false, true, DO_TEST_FULL("cachetune-colliding-types", false, false,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("cachetune-colliding-monitor", false, true, DO_TEST_FULL("cachetune-colliding-monitor", false, false,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_DIFFERENT("memorytune"); DO_TEST_DIFFERENT("memorytune");
DO_TEST_FULL("memorytune-colliding-allocs", false, true, DO_TEST_FULL("memorytune-colliding-allocs", false, false,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST_FULL("memorytune-colliding-cachetune", false, true, DO_TEST_FULL("memorytune-colliding-cachetune", false, false,
TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE); TEST_COMPARE_DOM_XML2XML_RESULT_FAIL_PARSE);
DO_TEST("tseg"); DO_TEST("tseg");