From 74ae8f2de38e0e0975566041977dff2fe7134fbe Mon Sep 17 00:00:00 2001 From: Alban Crequy Date: Wed, 17 May 2017 14:24:08 +0200 Subject: [PATCH] integration tests: better log messages --- integration/config.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/integration/config.sh b/integration/config.sh index 72eb51fdfa..ac7d37c21c 100644 --- a/integration/config.sh +++ b/integration/config.sh @@ -43,14 +43,15 @@ scope_end_suite() { list_containers() { local host=$1 echo "Listing containers on ${host}:" - curl -s "http://${host}:4040/api/topology/containers?system=show" | jq -r '.nodes[] | select(has("metadata")) | .metadata[] | select(.id == "docker_image_name") | .value' + curl -s "http://${host}:4040/api/topology/containers?system=show" | jq -r '.nodes[] | select(has("metadata")) | { "image": .metadata[] | select(.id == "docker_image_name") | .value, "label": .label, "id": .id} | .id + " (" + .image + ", " + .label + ")"' + echo } list_connections() { local host=$1 echo "Listing connections on ${host}:" - curl -s "http://${host}:4040/api/topology/containers?system=show" | jq -r '.nodes[] | select(has("adjacency")) | { "from": .id, "to": .adjacency[]} | .from + " -> " + .to' - + curl -s "http://${host}:4040/api/topology/containers?system=show" | jq -r '.nodes[] | select(has("adjacency")) | { "from_name": .label, "from_id": .id, "to": .adjacency[]} | .from_id + " (" + .from_name+ ") -> " + .to' + echo } # this checks we have a named node in the given view