diff options
author | Michael Lumish <mlumish@google.com> | 2017-10-17 16:28:01 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-17 16:28:01 -0700 |
commit | 523fefe821407d9364f8e5062f45b3994aaf0ab4 (patch) | |
tree | 6466ba93128b750d26872dfa9c9d15dc03c9f6c6 /tools/run_tests | |
parent | 342d2a4c9a757b0eeed9bdbd1105aeed94c7512b (diff) | |
parent | fbc182e1257385e637b42a877cd205b5972ca521 (diff) |
Merge pull request #13043 from murgatroid99/grpc-node_interop
Switch Node interop tests to use grpc-node repo
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-x | tools/run_tests/dockerize/build_interop_image.sh | 8 | ||||
-rwxr-xr-x | tools/run_tests/run_interop_tests.py | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/tools/run_tests/dockerize/build_interop_image.sh b/tools/run_tests/dockerize/build_interop_image.sh index 9d8ad5325c..09e062980d 100755 --- a/tools/run_tests/dockerize/build_interop_image.sh +++ b/tools/run_tests/dockerize/build_interop_image.sh @@ -48,6 +48,14 @@ else echo "WARNING: grpc-go not found, it won't be mounted to the docker container." fi +echo "GRPC_NODE_ROOT: ${GRPC_NODE_ROOT:=$(cd ../grpc-node && pwd)}" +if [ -n "$GRPC_NODE_ROOT" ] +then + MOUNT_ARGS+=" -v $GRPC_NODE_ROOT:/var/local/jenkins/grpc-node:ro" +else + echo "WARNING: grpc-node not found, it won't be mounted to the docker container." +fi + mkdir -p /tmp/ccache # Mount service account dir if available. diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 2f826871a0..b20d6ce88e 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -313,20 +313,20 @@ class Http2Client: class NodeLanguage: def __init__(self): - self.client_cwd = None - self.server_cwd = None + self.client_cwd = '../grpc-node' + self.server_cwd = '../grpc-node' self.safename = str(self) def client_cmd(self, args): - return ['tools/run_tests/interop/with_nvm.sh', - 'node', 'src/node/interop/interop_client.js'] + args + return ['packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh', + 'node', 'test/interop/interop_client.js'] + args def cloud_to_prod_env(self): return {} def server_cmd(self, args): - return ['tools/run_tests/interop/with_nvm.sh', - 'node', 'src/node/interop/interop_server.js'] + args + return ['packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh', + 'node', 'test/interop/interop_server.js'] + args def global_env(self): return {} |