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

Better error reporting for runmqsc

Browse Source
This commit is contained in:
Riccardo Biraghi
2018-04-09 11:41:28 +01:00
parent 13e41aeb37
commit 6287a25156
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/docker/docker_api_test.go
View File

@@ -24,6 +24,7 @@ import (
"fmt" "fmt"
"io" "io"
"path/filepath" "path/filepath"
"regexp"
"strconv" "strconv"
"strings" "strings"
"testing" "testing"
@@ -356,9 +357,11 @@ func TestMQSC(t *testing.T) {
id := runContainer(t, cli, &containerConfig) id := runContainer(t, cli, &containerConfig)
defer cleanContainer(t, cli, id) defer cleanContainer(t, cli, id)
waitForReady(t, cli, id) waitForReady(t, cli, id)
rc := execContainerWithExitCode(t, cli, id, "mqm", []string{"bash", "-c", "echo 'DISPLAY QLOCAL(test)' | runmqsc"}) mqscOutput := execContainerWithOutput(t, cli, id, "mqm", []string{"bash", "-c", "echo 'DISPLAY QLOCAL(test)' | runmqsc"})
if rc != 0 { r := regexp.MustCompile("AMQ[0-9][0-9][0-9][0-9]E")
t.Fatalf("Expected runmqsc to exit with rc=0, got %v", rc) amqerrCode := r.FindString(mqscOutput)
if amqerrCode != "" {
t.Fatalf("MQSC command failed with error %v", amqerrCode)
} }
} }
@@ -395,11 +398,13 @@ func TestReadiness(t *testing.T) {
t.Log(execContainerWithOutput(t, cli, id, "root", []string{"cat", "/etc/mqm/test.mqsc"})) t.Log(execContainerWithOutput(t, cli, id, "root", []string{"cat", "/etc/mqm/test.mqsc"}))
for { for {
readyRC := execContainerWithExitCode(t, cli, id, "mqm", []string{"chkmqready"}) readyRC := execContainerWithExitCode(t, cli, id, "mqm", []string{"chkmqready"})
queueCheckRC := execContainerWithExitCode(t, cli, id, "mqm", []string{"bash", "-c", queueCheckCommand}) queueCheckOut := execContainerWithOutput(t, cli, id, "mqm", []string{"bash", "-c", queueCheckCommand})
t.Logf("readyRC=%v,queueCheckRC=%v\n", readyRC, queueCheckRC) t.Logf("readyRC=%v", readyRC)
if readyRC == 0 { if readyRC == 0 {
if queueCheckRC != 0 { r := regexp.MustCompile("AMQ[0-9][0-9][0-9][0-9]E")
t.Fatalf("chkmqready returned %v when MQSC had not finished", readyRC) amqerrCode := r.FindString(queueCheckOut)
if (amqerrCode != "") {
t.Fatalf("MQSC failed with error %v. chkmqready returned %v when MQSC had not finished", amqerrCode, readyRC)
} else { } else {
// chkmqready says OK, and the last queue exists, so return // chkmqready says OK, and the last queue exists, so return
t.Log(execContainerWithOutput(t, cli, id, "root", []string{"bash", "-c", "echo 'DISPLAY QLOCAL(test1)' | runmqsc"})) t.Log(execContainerWithOutput(t, cli, id, "root", []string{"bash", "-c", "echo 'DISPLAY QLOCAL(test1)' | runmqsc"}))