From ee7a88c7d242f73e1f1bddc0bf7a3e15a65eee4f Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Thu, 4 Feb 2016 17:00:44 -0800
Subject: [PATCH] fix note distribtest nvm problem
---
test/distrib/node/run_distrib_test.sh | 6 +++---
tools/run_tests/distribtest_targets.py | 3 ++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/test/distrib/node/run_distrib_test.sh b/test/distrib/node/run_distrib_test.sh
index dbbcad25e4..90637cc01d 100755
--- a/test/distrib/node/run_distrib_test.sh
+++ b/test/distrib/node/run_distrib_test.sh
@@ -36,17 +36,17 @@ nvm install $1
npm install -g node-static
-STATIC_SERVER=localhost
+STATIC_SERVER=127.0.0.1
STATIC_PORT=8080
# Serves the input_artifacts directory statically at localhost:8080
-static "$EXTERNAL_GIT_ROOT/input_artifacts" -a STATIC_SERVER -p STATIC_PORT &
+static "$EXTERNAL_GIT_ROOT/input_artifacts" -a $STATIC_SERVER -p $STATIC_PORT &
STATIC_PID=$!
STATIC_URL="http://$STATIC_SERVER:$STATIC_PORT/"
npm install --unsafe-perm $STATIC_URL/grpc.tgz --grpc_node_binary_host_mirror=$STATIC_URL
-kill $STATIC_PID
+kill -9 $STATIC_PID
./distrib_test.js
diff --git a/tools/run_tests/distribtest_targets.py b/tools/run_tests/distribtest_targets.py
index 7fd0800fa0..e9a80d2cf4 100644
--- a/tools/run_tests/distribtest_targets.py
+++ b/tools/run_tests/distribtest_targets.py
@@ -104,7 +104,8 @@ class NodeDistribTest(object):
'tools/dockerfile/distribtest/node_%s_%s' % (
self.docker_suffix,
self.arch),
- 'test/distrib/node/run_distrib_test.sh %s' % (
+ # bash -l needed to make nvm available
+ 'bash -l test/distrib/node/run_distrib_test.sh %s' % (
self.node_version))
def __str__(self):
return self.name
--
GitLab