From: Jiri Denemark <jdenemar@redhat.com>
Date: Mon, 6 Jun 2016 14:55:05 +0000 (+0200)
Subject: tests: Create simple monitor in qemuMonitorTestNewFromFile
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=474e627892fb2d25161941511a2c8effcf285ba7;p=libvirt.git

tests: Create simple monitor in qemuMonitorTestNewFromFile

The current version uses the first JSON reply from the file as monitor
greeting. With the new parameter the caller can now request a simple
test monitor to be created, which uses an artificial greeting and uses
all JSON strings from the file as regular replies.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---

diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 5a27b3624e..b98f775fd4 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -53,7 +53,7 @@ testQemuCaps(const void *opaque)
                     abs_srcdir, data->base, data->archName) < 0)
         goto cleanup;
 
-    if (!(mon = qemuMonitorTestNewFromFile(repliesFile, data->xmlopt)))
+    if (!(mon = qemuMonitorTestNewFromFile(repliesFile, data->xmlopt, false)))
         goto cleanup;
 
     if (!(capsActual = virQEMUCapsNew()) ||
diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index c04663e4c0..c86a27adce 100644
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -930,7 +930,8 @@ qemuMonitorTestNew(bool json,
 
 qemuMonitorTestPtr
 qemuMonitorTestNewFromFile(const char *fileName,
-                           virDomainXMLOptionPtr xmlopt)
+                           virDomainXMLOptionPtr xmlopt,
+                           bool simple)
 {
     qemuMonitorTestPtr test = NULL;
     char *json = NULL;
@@ -940,6 +941,9 @@ qemuMonitorTestNewFromFile(const char *fileName,
     if (virTestLoadFile(fileName, &json) < 0)
         goto cleanup;
 
+    if (simple && !(test = qemuMonitorTestNewSimple(true, xmlopt)))
+        goto cleanup;
+
     /* Our JSON parser expects replies to be separated by a newline character.
      * Hence we must preprocess the file a bit. */
     tmp = singleReply = json;
diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index c42073787a..8e2f371d7b 100644
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -70,7 +70,8 @@ qemuMonitorTestPtr qemuMonitorTestNew(bool json,
                                       const char *greeting);
 
 qemuMonitorTestPtr qemuMonitorTestNewFromFile(const char *fileName,
-                                              virDomainXMLOptionPtr xmlopt);
+                                              virDomainXMLOptionPtr xmlopt,
+                                              bool simple);
 
 qemuMonitorTestPtr qemuMonitorTestNewAgent(virDomainXMLOptionPtr xmlopt);