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

Unified Diff: tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py

Issue 902763002: Parallelize telemetry unit tests on Android bots (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove fyi bot config (will create another CL for it) Created 5 years, 10 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 | « tools/profile_chrome/main.py ('k') | tools/telemetry/telemetry/core/browser_finder.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
diff --git a/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py b/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
index b7ec6a935000e7a3c3d004e4a6320b57141529fe..b5e70f135592843d980cc97b0dfa2666c25d9975 100644
--- a/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/android_command_line_backend_unittest.py
@@ -8,6 +8,7 @@ import unittest
from telemetry import benchmark
from telemetry.core.backends import adb_commands
from telemetry.core.backends import android_command_line_backend
+from telemetry.unittest_util import options_for_unittests
class _MockBackendSettings(object):
pseudo_exec_name = 'chrome'
@@ -48,7 +49,9 @@ class AndroidCommandLineBackendTest(unittest.TestCase):
Requires a device connected to the host.
"""
- serial = adb_commands.GetAttachedDevices()[0]
+ serial = options_for_unittests.GetCopy().device
+ if not serial:
+ serial = adb_commands.GetAttachedDevices()[0]
cmd_file = '/data/local/tmp/test_cmd'
adb = adb_commands.AdbCommands(device=serial)
backend_settings = _MockBackendSettings('/data/local/tmp/test_cmd')
@@ -69,7 +72,9 @@ class AndroidCommandLineBackendTest(unittest.TestCase):
Requires a device connected to the host.
"""
- serial = adb_commands.GetAttachedDevices()[0]
+ serial = options_for_unittests.GetCopy().device
+ if not serial:
+ serial = adb_commands.GetAttachedDevices()[0]
cmd_file = '/data/local/tmp/test_cmd'
adb = adb_commands.AdbCommands(device=serial)
backend_settings = _MockBackendSettings('/data/local/tmp/test_cmd')
« no previous file with comments | « tools/profile_chrome/main.py ('k') | tools/telemetry/telemetry/core/browser_finder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698