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 5a27b3624e637abc9092e16107bc740dd22f8dff..b98f775fd40a8b58b2d3dc8b49f45b39580097f5 100644 (file)
--- 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 c04663e4c0c26b3c36cafe06e5a1614fe7a8b88d..c86a27adce8724d7b072205b3b6368621a63e455 100644 (file)
--- 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 c42073787aaf1c02513e12906e3fc69b127a755b..8e2f371d7b468acb1e950e1ec68a47da2d8d702e 100644 (file)
--- 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);