Skip to content

Commit

Permalink
Merge pull request grpc#13394 from murgatroid99/node_interop_test_inv…
Browse files Browse the repository at this point in the history
…ocation_fix

Update Node interop test invocation to use new fixtures
  • Loading branch information
jtattermusch authored Nov 16, 2017
2 parents f6d4008 + a214a99 commit 57a6624
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions tools/run_tests/run_interop_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,14 +319,16 @@ def __init__(self):

def client_cmd(self, args):
return ['packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh',
'node', 'test/interop/interop_client.js'] + args
'node', '--require', './test/fixtures/native_native',
'test/interop/interop_client.js'] + args

def cloud_to_prod_env(self):
return {}

def server_cmd(self, args):
return ['packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh',
'node', 'test/interop/interop_server.js'] + args
'node', '--require', './test/fixtures/native_native',
'test/interop/interop_server.js'] + args

def global_env(self):
return {}
Expand Down Expand Up @@ -1242,7 +1244,7 @@ def aggregate_http2_results(stdout):
_HTTP2_TEST_CASES, http2_server_test_cases, resultset, num_failures,
args.cloud_to_prod_auth or args.cloud_to_prod, args.prod_servers,
args.http2_interop)

if num_failures:
sys.exit(1)
else:
Expand Down

0 comments on commit 57a6624

Please sign in to comment.