tests: introduce testVirNetDevBandwidthParse

The 'PARSE' macro does not use '#' or '##' directives,
or anything from outside of the macro other than the
cleanup label.

Turn it into a function.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/virnetdevbandwidthtest.c b/tests/virnetdevbandwidthtest.c
index 197d9364799ba3cc468384211708aa5b7571c2c7..a17737ec401cfd3827b1a42dfef495d2a851ad0b 100644 (file)
--- a/tests/virnetdevbandwidthtest.c
+++ b/tests/virnetdevbandwidthtest.c
@@ -39,27 +39,26 @@ struct testSetStruct {
     const bool hierarchical_class;
 };
 
-#define PARSE(xml, var) \
-    do { \
-        int rc; \
-        g_autoptr(xmlDoc) doc = NULL; \
-        g_autoptr(xmlXPathContext) ctxt = NULL; \
- \
-        if (!xml) \
-            break; \
- \
-        if (!(doc = virXMLParseStringCtxt((xml), \
-                                          "bandwidth definition", \
-                                          &ctxt))) \
-            goto cleanup; \
- \
-        rc = virNetDevBandwidthParse(&(var), \
-                                     NULL, \
-                                     ctxt->node, \
-                                     true); \
-        if (rc < 0) \
-            goto cleanup; \
-    } while (0)
+static int
+testVirNetDevBandwidthParse(virNetDevBandwidth **var,
+                            const char *xml)
+{
+    g_autoptr(xmlDoc) doc = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
+
+    if (!xml)
+        return 0;
+
+    if (!(doc = virXMLParseStringCtxt((xml),
+                                      "bandwidth definition",
+                                      &ctxt)))
+        return -1;
+
+    return virNetDevBandwidthParse(var,
+                                   NULL,
+                                   ctxt->node,
+                                   true);
+}
 
 static int
 testVirNetDevBandwidthSet(const void *data)
@@ -72,7 +71,8 @@ testVirNetDevBandwidthSet(const void *data)
     g_autofree char *actual_cmd = NULL;
     g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew();
 
-    PARSE(info->band, band);
+    if (testVirNetDevBandwidthParse(&band, info->band) < 0)
+        return -1;
 
     if (!iface)
         iface = "eth0";

diff --git a/tests/virnetdevopenvswitchtest.c b/tests/virnetdevopenvswitchtest.c
index 89ffc1e4b5047d468f2c77b235d02f677083a809..1026c890cd24a68218a2d6c3b9a061a9abe99494 100644 (file)
--- a/tests/virnetdevopenvswitchtest.c
+++ b/tests/virnetdevopenvswitchtest.c
@@ -45,27 +45,26 @@ struct testClearQosStruct {
     const unsigned char *vmid;
 };
 
-#define PARSE(xml, var) \
-    do { \
-        int rc; \
-        g_autoptr(xmlDoc) doc = NULL; \
-        g_autoptr(xmlXPathContext) ctxt = NULL; \
- \
-        if (!xml) \
-            break; \
- \
-        if (!(doc = virXMLParseStringCtxt((xml), \
-                                          "bandwidth definition", \
-                                          &ctxt))) \
-            goto cleanup; \
- \
-        rc = virNetDevBandwidthParse(&(var), \
-                                     NULL, \
-                                     ctxt->node, \
-                                     true); \
-        if (rc < 0) \
-            goto cleanup; \
-    } while (0)
+static int
+testVirNetDevBandwidthParse(virNetDevBandwidth **var,
+                            const char *xml)
+{
+    g_autoptr(xmlDoc) doc = NULL;
+    g_autoptr(xmlXPathContext) ctxt = NULL;
+
+    if (!xml)
+        return 0;
+
+    if (!(doc = virXMLParseStringCtxt((xml),
+                                      "bandwidth definition",
+                                      &ctxt)))
+        return -1;
+
+    return virNetDevBandwidthParse(var,
+                                   NULL,
+                                   ctxt->node,
+                                   true);
+}
 
 static const unsigned char vm_id[VIR_UUID_BUFLEN] = "fakeuuid";
 
@@ -161,7 +160,8 @@ testVirNetDevOpenvswitchInterfaceSetQos(const void *data)
     g_autofree char *actual_cmd = NULL;
     g_autoptr(virCommandDryRunToken) dryRunToken = virCommandDryRunTokenNew();
 
-    PARSE(info->band, band);
+    if (testVirNetDevBandwidthParse(&band, info->band) < 0)
+        return -1;
 
     if (!iface)
         iface = "tap-fake";