Commit 9d512d39 authored by slamm's avatar slamm Committed by Commit bot

Minor updates for local_server.py

BUG=

Review URL: https://codereview.chromium.org/575923002

Cr-Commit-Position: refs/heads/master@{#295206}
parent 872bf786
...@@ -10,6 +10,7 @@ import subprocess ...@@ -10,6 +10,7 @@ import subprocess
import sys import sys
from telemetry.core import forwarders from telemetry.core import forwarders
from telemetry.core import util
NamedPort = collections.namedtuple('NamedPort', ['name', 'port']) NamedPort = collections.namedtuple('NamedPort', ['name', 'port'])
...@@ -58,19 +59,19 @@ class LocalServer(object): ...@@ -58,19 +59,19 @@ class LocalServer(object):
server_module_name = self._server_backend_class.__module__ server_module_name = self._server_backend_class.__module__
self._devnull = open(os.devnull, 'w') self._devnull = open(os.devnull, 'w')
cmd = [sys.executable, '-m', __name__] cmd = [
cmd.extend(["run_backend"]) sys.executable, '-m', __name__,
cmd.extend([server_module_name, self._server_backend_class.__name__, 'run_backend',
server_args_as_json]) server_module_name,
self._server_backend_class.__name__,
server_args_as_json,
]
env = os.environ.copy() env = os.environ.copy()
env['PYTHONPATH'] = os.pathsep.join(sys.path) env['PYTHONPATH'] = os.pathsep.join(sys.path)
cwd = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..'))
self._subprocess = subprocess.Popen( self._subprocess = subprocess.Popen(
cmd, cwd=cwd, env=env, stdout=subprocess.PIPE) cmd, cwd=util.GetTelemetryDir(), env=env, stdout=subprocess.PIPE)
named_ports = self._GetNamedPortsFromBackend() named_ports = self._GetNamedPortsFromBackend()
named_port_pair_map = {'http': None, 'https': None, 'dns': None} named_port_pair_map = {'http': None, 'https': None, 'dns': None}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment