mononoke/integration tests: use $LOCALIP instead of ::1 or 127.0.0.1 (#65)

Summary:
Pull Request resolved: #65

Using $LOCALIP will ensure more consistent behavior when setting up the server in ipv4 or ipv6.
The LOCALIP variable was also abused when it was used to override ssh client address, so SSH_IP_OVEERIDE env was created here.
Lastly the result of `curl` call is now printed whenever the test failed to verify that Mononoke is running.

Reviewed By: farnz

Differential Revision: D24108186

fbshipit-source-id: e4b68dd2c5dd368851f0b00064088ffc442e31e0

Author: lukaspiatkowski

eden/mononoke/tests/integration/library.sh

@@ -56,6 +56,15 @@ function get_free_socket {
   "$GET_FREE_SOCKET"
 }
 
+function mononoke_address {
+  if [[ $LOCALIP == *":"* ]]; then
+    # ipv6, surround in brackets
+    echo -n "[$LOCALIP]:$MONONOKE_SOCKET"
+  else
+    echo -n "$LOCALIP:$MONONOKE_SOCKET"
+  fi
+}
+
 # return random value from [1, max_value]
 function random_int() {
   max_value=$1
@@ -98,7 +107,7 @@ function mononoke {
   --ssl-ticket-seeds "$TEST_CERTDIR/server.pem.seeds" \
   --debug \
   --test-instance \
-  --listening-host-port "[::1]:$MONONOKE_SOCKET" \
+  --listening-host-port "$(mononoke_address)" \
   --mononoke-config-path "$TESTTMP/mononoke-config" \
    "${COMMON_ARGS[@]}" >> "$TESTTMP/mononoke.out" 2>&1 &
   export MONONOKE_PID=$!
@@ -381,7 +390,15 @@ function wait_for_mononoke {
 
   if ! $SSLCURL 2>&1 | grep -q 'Empty reply'; then
     echo "Mononoke did not start" >&2
+
+    echo ""
+    echo "Results of curl invocation"
+    $SSLCURL -v
+
+    echo ""
+    echo "Log of Mononoke server"
     cat "$TESTTMP/mononoke.out"
+
     exit 1
   fi
 }
@@ -985,7 +1002,7 @@ function manual_scrub {
 
 function s_client {
     /usr/local/fbcode/platform007/bin/openssl s_client \
-        -connect localhost:$MONONOKE_SOCKET \
+        -connect "$(mononoke_address)" \
         -CAfile "${TEST_CERTDIR}/root-ca.crt" \
         -cert "${TEST_CERTDIR}/localhost.crt" \
         -key "${TEST_CERTDIR}/localhost.key" \
@@ -1041,7 +1058,7 @@ function start_edenapi_server {
   # server. The `sslcurl` function should help with this.
   GLOG_minloglevel=5 "$EDENAPI_SERVER" "$@" \
     --debug \
-    --listen-host 127.0.0.1 \
+    --listen-host "$LOCALIP" \
     --listen-port "$port" \
     --mononoke-config-path "$TESTTMP/mononoke-config" \
     --test-instance \
@@ -1077,11 +1094,11 @@ function start_edenapi_server {
 }
 
 function edenapi_make_req {
-	"$EDENAPI_MAKE_REQ" "$@"
+  "$EDENAPI_MAKE_REQ" "$@"
 }
 
 function edenapi_read_res {
-	"$EDENAPI_READ_RES" "$@"
+  "$EDENAPI_READ_RES" "$@"
 }
 
 function lfs_server {
@@ -1094,7 +1111,7 @@ function lfs_server {
   opts=(
     "${COMMON_ARGS[@]}"
     --mononoke-config-path "$TESTTMP/mononoke-config"
-    --listen-host 127.0.0.1
+    --listen-host "$LOCALIP"
     --listen-port "$port"
     --test-friendly-logging
   )
@@ -1432,7 +1449,7 @@ function traffic_replay() {
     --loglevel warn \
     --testrun \
     --hgcli "$MONONOKE_HGCLI" \
-    --mononoke-address "[::1]:$MONONOKE_SOCKET" \
+    --mononoke-address "$(mononoke_address)" \
     --mononoke-server-common-name localhost
 }
 
@@ -1744,7 +1761,7 @@ function commitcloud_fill_one() {
   "$MONONOKE_COMMITCLOUD_FILLONE" \
     hg-to-mononoke \
     --hgcli "$MONONOKE_HGCLI" \
-    --mononoke-address "[::1]:$MONONOKE_SOCKET" \
+    --mononoke-address "$(mononoke_address)" \
     --mononoke-server-common-name localhost \
     --cert-override "$CERTDIR/localhost.crt" \
     --private-key-override "$CERTDIR/localhost.key" \
@@ -1784,7 +1801,7 @@ function commitcloud_forwardfiller_iteration() {
   "$MONONOKE_COMMITCLOUD_FORWARDFILLER" \
     --num-workers 1 \
     --hgcli "$MONONOKE_HGCLI" \
-    --mononoke-address "[::1]:$MONONOKE_SOCKET" \
+    --mononoke-address "$(mononoke_address)" \
     --mononoke-server-common-name localhost \
     --cert-override "$CERTDIR/localhost.crt" \
     --private-key-override "$CERTDIR/localhost.key" \

eden/mononoke/tests/integration/nossh.sh

@@ -9,7 +9,12 @@ REPONAME="${REPONAME:-"$(hg config | grep remotefilelog.reponame | cut -d "=" -f
 CA_PEM=${CA_PEM:-"${TEST_CERTS}/root-ca.crt"}
 PRIVATE_KEY=${PRIVATE_KEY:-"${TEST_CERTS}/localhost.key"}
 CERT=${CERT:-"${TEST_CERTS}/localhost.crt"}
-MONONOKE_PATH="[::]:${MONONOKE_SOCKET}"
+if [[ $LOCALIP == *":"* ]]; then
+  # it is ipv6, surround with brackets
+  MONONOKE_PATH="[$LOCALIP]:${MONONOKE_SOCKET}"
+else
+  MONONOKE_PATH="$LOCALIP:${MONONOKE_SOCKET}"
+fi
 COMMON_NAME="localhost"
 
 "$MONONOKE_HGCLI" -R "$REPONAME" serve --stdio --mononoke-path "$MONONOKE_PATH" \

eden/mononoke/tests/integration/test-lfs-server-proxy-skip-upstream.t

@@ -12,8 +12,8 @@
 
 # Start a "server" that never responds as the upstream
   $ upstream_port="$(get_free_socket)"
-  $ upstream="http://127.0.0.1:${upstream_port}/"
-  $ ncat --sh-exec "sleep 1" --keep-open --listen 127.0.0.1 "$upstream_port" &
+  $ upstream="http://${LOCALIP}:${upstream_port}/"
+  $ ncat --sh-exec "sleep 1" --keep-open --listen "$LOCALIP" "$upstream_port" &
   $ nc_pid="$!"
 
 # Start a LFS server

eden/mononoke/tests/integration/test-metadata-no-network.t

@@ -32,7 +32,7 @@ start mononoke
   $ wait_for_mononoke
 
 pull from mononoke and log data
-  $ MOCK_USERNAME=foobar CLIENT_DEBUG=true LOCALIP="127.0.0.1" hgmn pull
+  $ MOCK_USERNAME=foobar CLIENT_DEBUG=true SSH_IP_OVERRIDE="$LOCALIP" hgmn pull
   pulling from ssh://user@dummy/repo
   remote: Metadata {
   remote:     session_id: SessionId(
@@ -58,7 +58,7 @@ pull from mononoke and log data
   remote: }
   searching for changes
   no changes found
-  $ MOCK_USERNAME=foobar CLIENT_DEBUG=true LOCALIP="2401:db00:31ff:ff1f:face:b00c:0:598" hgmn pull
+  $ MOCK_USERNAME=foobar CLIENT_DEBUG=true SSH_IP_OVERRIDE="2401:db00:31ff:ff1f:face:b00c:0:598" hgmn pull
   pulling from ssh://user@dummy/repo
   remote: Metadata {
   remote:     session_id: SessionId(

eden/mononoke/tests/integration/test-metadata.t

@@ -32,7 +32,7 @@ start mononoke
   $ wait_for_mononoke
 
 pull from mononoke and log data
-  $ MOCK_USERNAME=foobar CLIENT_DEBUG=true LOCALIP="127.0.0.1" hgmn pull
+  $ MOCK_USERNAME=foobar CLIENT_DEBUG=true SSH_IP_OVERRIDE="$LOCALIP" hgmn pull
   pulling from ssh://user@dummy/repo
   remote: Metadata {
   remote:     session_id: SessionId(

eden/scm/tests/dummyssh

@@ -49,7 +49,9 @@ while host_index < len(sys.argv) and sys.argv[host_index].startswith("-"):
 if sys.argv[host_index] != "user@dummy":
     sys.exit(-1)
 
-os.environ["SSH_CLIENT"] = "%s 1 2" % os.environ.get("LOCALIP", "127.0.0.1")
+os.environ["SSH_CLIENT"] = "%s 1 2" % os.environ.get(
+    "SSH_IP_OVERRIDE", os.environ.get("LOCALIP", "127.0.0.1")
+)
 
 log = open("dummylog", "ab")
 log.write(b"Got arguments")
@@ -77,9 +79,13 @@ if "hgcli" in hgcmd:
     cert = os.path.join(certdir, "localhost.crt")
     capem = os.path.join(certdir, "root-ca.crt")
     privatekey = os.path.join(certdir, "localhost.key")
+    localip = os.environ.get("LOCALIP", "127.0.0.1")
+    if ":" in localip:
+        # this is ipv6, put it in brackets
+        localip = "[" + localip + "]"
 
     hgcmd += (
-        " --mononoke-path [::1]:"
+        (" --mononoke-path %s:" % localip)
         + os.getenv("MONONOKE_SOCKET")
         + (
             " --cert %s --ca-pem %s --private-key %s --common-name localhost"

eden/scm/tests/dummyssh3.py

@@ -56,7 +56,9 @@ def parse_repo_path(path):
 if sys.argv[host_index] != "user@dummy":
     sys.exit(-1)
 
-os.environ["SSH_CLIENT"] = "%s 1 2" % os.environ.get("LOCALIP", "127.0.0.1")
+os.environ["SSH_CLIENT"] = "%s 1 2" % os.environ.get(
+    "SSH_IP_OVERRIDE", os.environ.get("LOCALIP", "127.0.0.1")
+)
 
 log = open("dummylog", "ab")
 log.write(b"Got arguments")
@@ -85,9 +87,13 @@ def parse_repo_path(path):
     cert = os.path.join(certdir, "localhost.crt")
     capem = os.path.join(certdir, "root-ca.crt")
     privatekey = os.path.join(certdir, "localhost.key")
+    localip = os.environ.get("LOCALIP", "127.0.0.1")
+    if ":" in localip:
+        # this is ipv6, put it in brackets
+        localip = "[" + localip + "]"
 
     hgcmd += (
-        " --mononoke-path [::1]:"
+        (" --mononoke-path %s:" % localip)
         + none_throws(os.getenv("MONONOKE_SOCKET"))
         + (
             " --cert %s --ca-pem %s --private-key %s --common-name localhost"