Merge pull request #24192 from ericgribkoff/revert_shlex_change

Revert "Merge pull request #24163 from murgatroid99/run_xds_tests_cli…
pull/24198/head
Eric Gribkoff 4 years ago committed by GitHub
commit e8d5758dc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      tools/run_tests/run_xds_tests.py

@ -21,6 +21,7 @@ import json
import logging import logging
import os import os
import random import random
import shlex
import socket import socket
import subprocess import subprocess
import sys import sys
@ -1799,10 +1800,9 @@ try:
rpcs_to_send=rpcs_to_send, rpcs_to_send=rpcs_to_send,
metadata_to_send=metadata_to_send) metadata_to_send=metadata_to_send)
logger.debug('running client: %s', client_cmd_formatted) logger.debug('running client: %s', client_cmd_formatted)
client_cmd = shlex.split(client_cmd_formatted)
try: try:
# We invoke the client using bash to avoid https://github.com/nvm-sh/nvm/issues/1866 client_process = subprocess.Popen(client_cmd,
client_process = subprocess.Popen(
['/bin/bash', '-i', '-c', client_cmd_formatted],
env=client_env, env=client_env,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
stdout=test_log_file) stdout=test_log_file)

Loading…
Cancel
Save