testsuite: cover job-info lookup JSON_DECODE flag

Problem: There is no coverage for the new job info lookup
JSON_DECODE flag.

Add coverage to t2230-job-info-lookup.t and add a --json-decode
flag to the utility test tool job-info/info_lookup.

Author: chu11

t/job-info/info_lookup.c

@@ -14,33 +14,56 @@
 #include <unistd.h>
 #include <jansson.h>
 #include <stdio.h>
+#include <getopt.h>
 #include <flux/core.h>
 
 #include "src/common/libutil/log.h"
+#include "ccan/str/str.h"
+
+#define OPTIONS "j"
+static const struct option longopts[] = {
+    {"json-decode", no_argument, 0, 'j'},
+    { 0, 0, 0, 0 },
+};
+
+static void usage (void)
+{
+    fprintf (stderr, "Usage: info_lookup [--json-decode] <jobid> <key> ...\n");
+    exit (1);
+}
 
 int main (int argc, char *argv[])
 {
     flux_t *h;
     flux_future_t *f;
     flux_jobid_t id;
     json_t *keys;
-    int i;
+    int i, ch;
+    int flags = 0;
 
-    if (argc < 3) {
-        fprintf (stderr, "Usage: info_lookup <jobid> <key> ...\n");
-        exit (1);
+    while ((ch = getopt_long (argc, argv, OPTIONS, longopts, NULL)) != -1) {
+        switch (ch) {
+        case 'j': /* --json-decode */
+            flags |= FLUX_JOB_LOOKUP_JSON_DECODE;
+            break;
+        default:
+            usage ();
+            break;
+        }
     }
+    if ((argc - optind) < 2)
+        usage ();
 
     if (!(h = flux_open (NULL, 0)))
         log_err_exit ("flux_open");
 
-    if (flux_job_id_parse (argv[1], &id) < 0)
+    if (flux_job_id_parse (argv[optind++], &id) < 0)
         log_msg_exit ("error parsing jobid: %s", argv[1]);
 
     if (!(keys = json_array ()))
         log_msg_exit ("json_array");
 
-    for (i = 2; i < argc; i++) {
+    for (i = optind; i < argc; i++) {
         json_t *key = json_string (argv[i]);
         if (!key)
             log_msg_exit ("json_string_value");
@@ -55,20 +78,39 @@ int main (int argc, char *argv[])
                              "{s:I s:O s:i}",
                              "id", id,
                              "keys", keys,
-                             "flags", 0)))
+                             "flags", flags)))
         log_err_exit ("flux_rpc_pack");
 
-    for (i = 2; i < argc; i++) {
-        json_t *value;
-        char *s;
-        if (flux_rpc_get_unpack (f, "{s:o}", argv[i], &value) < 0)
-            log_msg_exit ("job-info.lookup: %s",
-                          future_strerror (f, errno));
-        if (!(s = json_dumps (value, JSON_ENCODE_ANY)))
-            log_msg_exit ("invalid json result");
-        printf ("%s\n", s);
+    for (i = optind; i < argc; i++) {
+        if (flags & FLUX_JOB_LOOKUP_JSON_DECODE) {
+            json_t *value;
+            char *s;
+            if (flux_rpc_get_unpack (f, "{s:o}", argv[i], &value) < 0)
+                log_msg_exit ("job-info.lookup: %s",
+                              future_strerror (f, errno));
+            if (streq (argv[i], "jobspec") || streq (argv[i], "R")) {
+                if (!json_is_object (value))
+                    log_msg_exit ("job-info.lookup: key %s not an object",
+                                  argv[i]);
+            }
+            else {
+                if (!json_is_string (value))
+                    log_msg_exit ("job-info.lookup: key %s not a string",
+                                  argv[i]);
+            }
+            if (!(s = json_dumps (value, JSON_ENCODE_ANY)))
+                log_msg_exit ("invalid json result");
+            printf ("%s\n", s);
+            free (s);
+        }
+        else {
+            char *s;
+            if (flux_rpc_get_unpack (f, "{s:s}", argv[i], &s) < 0)
+                log_msg_exit ("job-info.lookup: %s",
+                              future_strerror (f, errno));
+            printf ("%s\n", s);
+        }
         fflush (stdout);
-        free (s);
     }
 
     flux_future_destroy (f);

t/t2230-job-info-lookup.t

@@ -310,6 +310,22 @@ test_expect_success 'job-info.lookup multiple keys fails on 1 bad entry' '
 	test_must_fail ${INFOLOOKUP} $jobid eventlog jobspec J > all_info_b.out
 '
 
+#
+# job info json decode tests
+#
+
+test_expect_success 'job-info.lookup: decode non-json returns string' '
+	jobid=$(submit_job) &&
+	${INFOLOOKUP} --json-decode $jobid eventlog > info_decode_1.out &&
+	grep submit info_decode_1.out
+'
+
+test_expect_success 'job-info.lookup: decode json returns object' '
+	jobid=$(submit_job) &&
+	${INFOLOOKUP} --json-decode $jobid jobspec > info_decode_2.out &&
+	grep sleep info_decode_2.out
+'
+
 #
 # stats & corner cases
 #