From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 13 Apr 2016 08:36:00 +0000 (+0200)
Subject: qemuxml2argvtest: do not mock virCommand
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cbbd74aad59367f3625e2ee2e6185963c0a6809c;p=libvirt.git

qemuxml2argvtest: do not mock virCommand

Mock virNetDevRunEthernetScript instead.

This restores the VIR_TEST_REGENERATE_OUTPUT functionality.
---

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d9e1f6cb90..e5bf9c614a 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1808,6 +1808,7 @@ virNetDevReplaceMacAddress;
 virNetDevReplaceNetConfig;
 virNetDevRestoreMacAddress;
 virNetDevRestoreNetConfig;
+virNetDevRunEthernetScript;
 virNetDevRxFilterFree;
 virNetDevRxFilterModeTypeFromString;
 virNetDevRxFilterModeTypeToString;
diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c
index eb2a5b4353..1616eeddee 100644
--- a/tests/qemuxml2argvmock.c
+++ b/tests/qemuxml2argvmock.c
@@ -132,12 +132,9 @@ virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED,
 }
 
 int
-virCommandRun(virCommandPtr cmd ATTRIBUTE_UNUSED,
-              int *exitstatus)
+virNetDevRunEthernetScript(const char *ifname ATTRIBUTE_UNUSED,
+                           const char *script ATTRIBUTE_UNUSED)
 {
-    if (exitstatus)
-        *exitstatus = 0;
-
     return 0;
 }