qemumonitortestutils: Improve error reporting from mock qemu monitor

Use the JSON error messages to report errors back to the caller in
addition to erroring out. The error reported from the event loop from
the mock function of the monitor was later overwritten by the call to
the monitor/agent interaction API. This will also allow testing of error
reporting.

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index e5e734e17629a6c19c56f5cbbf4e34da8c0cf872..721b7c6550c3a74ecd7c36e4b623205ff487ca1c 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -97,6 +97,8 @@ qemuMonitorTestAddReponse(qemuMonitorTestPtr test,
     size_t want = strlen(response) + 2;
     size_t have = test->outgoingCapacity - test->outgoingLength;
 
+    VIR_DEBUG("Adding response to monitor command: '%s", response);
+
     if (have < want) {
         size_t need = want - have;
         if (VIR_EXPAND_N(test->outgoing, test->outgoingCapacity, need) < 0)
@@ -111,7 +113,7 @@ qemuMonitorTestAddReponse(qemuMonitorTestPtr test,
 }
 
 
-static int
+int
 qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test)
 {
     if (test->agent || test->json) {
@@ -125,12 +127,48 @@ qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test)
 }
 
 
+int ATTRIBUTE_FMT_PRINTF(2, 3)
+qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...)
+{
+    va_list msgargs;
+    char *msg = NULL;
+    char *jsonmsg = NULL;
+    int ret = -1;
+
+    va_start(msgargs, errmsg);
+
+    if (virVasprintf(&msg, errmsg, msgargs) < 0)
+        goto cleanup;
+
+    if (test->agent || test->json) {
+        if (virAsprintf(&jsonmsg, "{ \"error\": "
+                                  " { \"desc\": \"%s\", "
+                                  "   \"class\": \"UnexpectedCommand\" } }",
+                                  msg) < 0)
+            goto cleanup;
+    } else {
+        if (virAsprintf(&jsonmsg, "error: '%s'", msg) < 0)
+            goto cleanup;
+    }
+
+    ret = qemuMonitorTestAddReponse(test, jsonmsg);
+
+cleanup:
+    va_end(msgargs);
+    VIR_FREE(msg);
+    VIR_FREE(jsonmsg);
+    return ret;
+}
+
+
 static int
 qemuMonitorTestProcessCommand(qemuMonitorTestPtr test,
                               const char *cmdstr)
 {
     int ret;
 
+    VIR_DEBUG("Processing string from monitor handler: '%s", cmdstr);
+
     if (test->nitems == 0) {
         return qemuMonitorTestAddUnexpectedErrorResponse(test);
     } else {
@@ -399,8 +437,7 @@ qemuMonitorTestProcessCommandDefault(qemuMonitorTestPtr test,
             return -1;
 
         if (!(cmdname = virJSONValueObjectGetString(val, "execute"))) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           "Missing command name in %s", cmdstr);
+            ret = qemuMonitorReportError(test, "Missing command name in %s", cmdstr);
             goto cleanup;
         }
     } else {
@@ -410,8 +447,9 @@ qemuMonitorTestProcessCommandDefault(qemuMonitorTestPtr test,
         cmdname = cmdcopy;
 
         if (!(tmp = strchr(cmdcopy, ' '))) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           "Cannot find command name in '%s'", cmdstr);
+            ret = qemuMonitorReportError(test,
+                                         "Cannot find command name in '%s'",
+                                         cmdstr);
             goto cleanup;
         }
         *tmp = '\0';
@@ -465,8 +503,7 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test,
         return -1;
 
     if (!(cmdname = virJSONValueObjectGetString(val, "execute"))) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       "Missing guest-sync command name");
+        ret = qemuMonitorReportError(test, "Missing guest-sync command name");
         goto cleanup;
     }
 
@@ -476,14 +513,12 @@ qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test,
     }
 
     if (!(args = virJSONValueObjectGet(val, "arguments"))) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       "Missing arguments for guest-sync");
+        ret = qemuMonitorReportError(test, "Missing arguments for guest-sync");
         goto cleanup;
     }
 
     if (virJSONValueObjectGetNumberUlong(args, "id", &id)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       "Missing id for guest sync");
+        ret = qemuMonitorReportError(test, "Missing id for guest sync");
         goto cleanup;
     }
 

diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h
index 588c750a7f345929102049322cee97dd9203e294..5e90150b6706517d812d497caaa5d25bc5b60bc1 100644 (file)
--- a/tests/qemumonitortestutils.h
+++ b/tests/qemumonitortestutils.h
@@ -41,8 +41,11 @@ int qemuMonitorTestAddHandler(qemuMonitorTestPtr test,
 int qemuMonitorTestAddReponse(qemuMonitorTestPtr test,
                               const char *response);
 
+int qemuMonitorTestAddUnexpectedErrorResponse(qemuMonitorTestPtr test);
+
 void *qemuMonitorTestItemGetPrivateData(qemuMonitorTestItemPtr item);
 
+int qemuMonitorReportError(qemuMonitorTestPtr test, const char *errmsg, ...);
 
 int qemuMonitorTestAddItem(qemuMonitorTestPtr test,
                            const char *command_name,