testsuite: expand testing in t2355-resource-journal.t

Problem: Newly added options to `flux resource eventlog` are not
tested in t2355-resource-journal.t.

Expand testing to cover new options.

Author: grondo

t/t2355-resource-journal.t

@@ -39,6 +39,68 @@ test_expect_success 'reload resource with monitor-force-up' '
 test_expect_success 'flux resource eventlog works' '
 	flux resource eventlog -f json --wait=resource-define >forcelog
 '
+test_expect_success 'flux resource eventlog formats as text by default' '
+	flux resource eventlog | grep method=
+'
+test_expect_success 'flux resource eventlog --time-format=raw works' '
+	flux resource eventlog --time-format=raw > out.raw &&
+	test_debug "cat out.raw" &&
+	grep resource-define out.raw | awk "{print \$1}" \
+		| grep "^[^.]*\.[^.]*$"
+'
+test_expect_success 'flux resource eventlog --time-format=iso works' '
+	TZ=UTC flux resource eventlog --time-format=iso > out.iso &&
+	test_debug "cat out.iso" &&
+	grep resource-define out.iso | awk "{print \$1}" | grep "Z$"
+'
+test_expect_success 'flux resource eventlog --time-format=offset works' '
+	TZ=UTC flux resource eventlog --time-format=offset > out.offset &&
+	test_debug "cat out.offset" &&
+	head -n1 out.offset | awk "{print \$1}" | grep "^ *0\.0"
+'
+test_expect_success 'flux resource eventlog --time-format=human works' '
+	TZ=UTC flux resource eventlog --time-format=human > out.Thuman &&
+	test_debug "cat out.Thuman" &&
+	head -n1 out.Thuman | grep "^\[...[0-9][0-9] [0-9][0-9]:[0-9][0-9]\]"
+'
+test_expect_success 'flux resource eventlog --human works' '
+	TZ=UTC flux resource eventlog --human > out.human &&
+	test_debug "cat out.human" &&
+	head -n1 out.human | grep "^\[...[0-9][0-9] [0-9][0-9]:[0-9][0-9]\]"
+'
+has_color() {
+        # To grep for ansi escape we need the help of the non-shell builtin
+        # printf(1), so run under env(1) so we don't get shell builtin:
+        grep "$(env printf "\x1b\[")" $1 >/dev/null
+}
+for opt in "-HL" "-L" "-Lalways" "--color" "--color=always"; do
+        test_expect_success "flux resource eventlog $opt forces color on" '
+                name=notty${opt##--color=} &&
+                outfile=color-${name:-default}.out &&
+                flux resource eventlog ${opt} >$outfile &&
+                test_debug "cat $outfile" &&
+                has_color $outfile
+        '
+done
+for opt in "" "--color" "--color=always" "--color=auto" "-H"; do
+        test_expect_success "flux resource eventlog $opt shows color on tty" '
+                name=${opt##--color=} &&
+                outfile=color-${name:-default}.out &&
+                runpty.py flux resource eventlog ${opt} $jobid >$outfile &&
+                test_debug "cat $outfile" &&
+                has_color $outfile
+        '
+done
+for opt in "-HLnever" "-Lnever" "--color=never"; do
+	test_expect_success "flux resource eventlog $opt disables color on tty" '
+		name=${opt##--color=} &&
+		outfile=color-${name:-default}.out &&
+		runpty.py flux resource eventlog ${opt} >$outfile &&
+		test_debug "cat $outfile" &&
+		test_must_fail has_color $outfile
+	'
+done
+
 test_expect_success '1st event: restart online=0-1' '
 	head -1 forcelog >forcelog.1 &&
 	jq -e ".name == \"restart\"" forcelog.1 &&