diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-04-08 00:46:15 +0200 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2016-04-08 00:46:15 +0200 |
| commit | bdf80ac31f407d7886acd6a0fe2fb1ab4c43c6c9 (patch) | |
| tree | fad0c4c08c6104fb85cb3539a48cd90ff706d9f8 /tools/gcp/stress_test/run_server.py | |
| parent | 6415043781e0b73008b3db539f18354fe776241a (diff) | |
| parent | d6ac251d4be334d7e13cfedb6181c161fdf05c41 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into gpr_malloc_is_all
Diffstat (limited to 'tools/gcp/stress_test/run_server.py')
| -rwxr-xr-x | tools/gcp/stress_test/run_server.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/gcp/stress_test/run_server.py b/tools/gcp/stress_test/run_server.py index dc4741b95e..0d9a653d18 100755 --- a/tools/gcp/stress_test/run_server.py +++ b/tools/gcp/stress_test/run_server.py @@ -1,5 +1,5 @@ #!/usr/bin/env python2.7 -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -62,7 +62,7 @@ def run_server(): run_id = env['RUN_ID'] # The unique run id for this test image_type = env['STRESS_TEST_IMAGE_TYPE'] - image_name = env['STRESS_TEST_IMAGE'] + stress_server_cmd = env['STRESS_TEST_CMD'].split() args_str = env['STRESS_TEST_ARGS_STR'] pod_name = env['POD_NAME'] project_id = env['GCP_PROJECT_ID'] @@ -98,7 +98,7 @@ def run_server(): # Update status that the test is starting (in the status table) bq_helper.insert_summary_row(EventType.STARTING, details) - stress_cmd = [image_name] + [x for x in args_str.split()] + stress_cmd = stress_server_cmd + [x for x in args_str.split()] print 'Launching process %s ...' % stress_cmd stress_p = subprocess.Popen(args=stress_cmd, |