From 7f78c6e62aee96a532de939b830b0ca4babcc050 Mon Sep 17 00:00:00 2001 From: Nicolas MASSART Date: Thu, 1 Nov 2018 07:30:07 +0100 Subject: [PATCH] [NC-1851] fix ws endpoint protocol (#216) --- quickstart/listQuickstartServices.sh | 2 +- .../pantheon/tests/quickstart/DockerQuickstartTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/quickstart/listQuickstartServices.sh b/quickstart/listQuickstartServices.sh index 64019b1cd7..2482aba558 100755 --- a/quickstart/listQuickstartServices.sh +++ b/quickstart/listQuickstartServices.sh @@ -57,7 +57,7 @@ if [ ${#dots} -gt ${maxRetryCount} ]; then echo "****************************************************************${NORMAL}" else echo "JSON-RPC ${BOLD}HTTP${NORMAL}${CYAN} service endpoint : ${ORANGE}http://${HOST}:${explorerMapping##*:}/jsonrpc${CYAN} *" - echo "JSON-RPC ${BOLD}WebSocket${NORMAL}${CYAN} service endpoint : ${ORANGE}http://${HOST}:${explorerMapping##*:}/jsonws${CYAN} *" + echo "JSON-RPC ${BOLD}WebSocket${NORMAL}${CYAN} service endpoint : ${ORANGE}ws://${HOST}:${explorerMapping##*:}/jsonws${CYAN} *" echo "${CYAN}Web block explorer address : ${ORANGE}http://${HOST}:${explorerMapping##*:}${CYAN} * " echo "****************************************************************${NORMAL}" fi diff --git a/quickstart/src/test/java/tech/pegasys/pantheon/tests/quickstart/DockerQuickstartTest.java b/quickstart/src/test/java/tech/pegasys/pantheon/tests/quickstart/DockerQuickstartTest.java index 924738920e..5ea600f3d2 100644 --- a/quickstart/src/test/java/tech/pegasys/pantheon/tests/quickstart/DockerQuickstartTest.java +++ b/quickstart/src/test/java/tech/pegasys/pantheon/tests/quickstart/DockerQuickstartTest.java @@ -293,7 +293,8 @@ public class DockerQuickstartTest { final Pattern pattern; EndpointsIdentifier(final String lineLabel) { - pattern = Pattern.compile(lineLabel + ".+(http://.+:[0-9]+)", Pattern.DOTALL); + pattern = + Pattern.compile(lineLabel + ".+((http|ws)://.+:[0-9]+/{0,1}[a-z]*)", Pattern.DOTALL); } }