academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include timestamp in test output for JSON logs

Browse Source 
For a failing test, JSON log output from a container is abridged to just include the message text.  This change adds the timestamp as well.
This commit is contained in:
arthur.barr@uk.ibm.com
2023-06-01 14:42:47 +01:00
committed by Arthur Barr
parent 05fe51d96d
commit 3599852fc1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/container/docker_api_test_util.go
View File

@@ -623,9 +623,11 @@ func inspectTextLogs(t *testing.T, cli ce.ContainerInterface, ID string) string
for scanner.Scan() { for scanner.Scan() {
text := scanner.Text() text := scanner.Text()
if strings.HasPrefix(text, "{") { if strings.HasPrefix(text, "{") {
// If it's a JSON log message, it makes it hard to debug the test, as the JSON
// is embedded in the long test output. So just summarize the JSON instead.
var e map[string]interface{} var e map[string]interface{}
json.Unmarshal([]byte(text), &e) json.Unmarshal([]byte(text), &e)
fmt.Fprintf(buf, "{\"message\": \"%v\", ...}\n", e["message"]) fmt.Fprintf(buf, "{\"ibm_datetime\": \"%v\", \"message\": \"%v\", ...}\n", e["ibm_datetime"], e["message"])
} else { } else {
fmt.Fprintln(buf, text) fmt.Fprintln(buf, text)
} }