Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(177)

Unified Diff: tools/telemetry/telemetry/core/local_server.py

Issue 575923002: Minor updates for local_server.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/local_server.py
diff --git a/tools/telemetry/telemetry/core/local_server.py b/tools/telemetry/telemetry/core/local_server.py
index bd2d0db3a93cf1acc51eb3b233c8d0ab1942b99e..3d2442afc3eb1113e863e3647c8e0266147e5467 100644
--- a/tools/telemetry/telemetry/core/local_server.py
+++ b/tools/telemetry/telemetry/core/local_server.py
@@ -10,6 +10,7 @@ import subprocess
import sys
from telemetry.core import forwarders
+from telemetry.core import util
NamedPort = collections.namedtuple('NamedPort', ['name', 'port'])
@@ -58,19 +59,19 @@ class LocalServer(object):
server_module_name = self._server_backend_class.__module__
self._devnull = open(os.devnull, 'w')
- cmd = [sys.executable, '-m', __name__]
- cmd.extend(["run_backend"])
- cmd.extend([server_module_name, self._server_backend_class.__name__,
- server_args_as_json])
+ cmd = [
+ sys.executable, '-m', __name__,
+ 'run_backend',
+ server_module_name,
+ self._server_backend_class.__name__,
+ server_args_as_json,
+ ]
env = os.environ.copy()
env['PYTHONPATH'] = os.pathsep.join(sys.path)
- cwd = os.path.abspath(
- os.path.join(os.path.dirname(__file__), '..', '..'))
-
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_port_pair_map = {'http': None, 'https': None, 'dns': None}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698