Commit a3da58f9 authored by Ned Nguyen's avatar Ned Nguyen Committed by Commit Bot

Convert Telemetry test scripts to use vpython

Bug:805552
Change-Id: Ifd631d785f309d9f46b401daaec44d0cf89a8631

Pinpoint tryjobs:

Android: https://pinpoint-dot-chromeperf.appspot.com/job/14c63ffa440000
Linux: https://pinpoint-dot-chromeperf.appspot.com/job/10787612440000
Mac: https://pinpoint-dot-chromeperf.appspot.com/job/1499113a440000
Win: https://pinpoint-dot-chromeperf.appspot.com/job/1381251a440000
Change-Id: Ifd631d785f309d9f46b401daaec44d0cf89a8631
Reviewed-on: https://chromium-review.googlesource.com/956203
Commit-Queue: Ned Nguyen <nednguyen@google.com>
Reviewed-by: default avatarRobbie Iannucci <iannucci@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542053}
parent 64c6dc07
#!/usr/bin/env python
#!/usr/bin/env vpython
# Copyright 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
......
#!/usr/bin/env python
#!/usr/bin/env vpython
# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
......
#!/usr/bin/env python
#!/usr/bin/env vpython
# Copyright 2016 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
......
#!/usr/bin/env python
#!/usr/bin/env vpython
# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
......
......@@ -16,11 +16,8 @@ class ScriptsSmokeTest(unittest.TestCase):
perf_dir = os.path.dirname(__file__)
def RunPerfScript(self, command, venv=False):
def RunPerfScript(self, command):
main_command = [sys.executable]
# TODO(crbug.com/805552): Remove if/else block
if venv:
main_command = ['vpython']
args = main_command + command.split(' ')
proc = subprocess.Popen(args, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT, cwd=self.perf_dir)
......@@ -50,8 +47,7 @@ class ScriptsSmokeTest(unittest.TestCase):
@decorators.Disabled('chromeos') # crbug.com/814068
def testRunRecordWprList(self):
return_code, stdout = self.RunPerfScript('record_wpr --list-benchmarks',
venv=True)
return_code, stdout = self.RunPerfScript('record_wpr --list-benchmarks')
# TODO(nednguyen): Remove this once we figure out why importing
# small_profile_extender fails on Android dbg.
# crbug.com/561668
......
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