build/android/pylib/gtest/setup.py - Issue 221823011: [Android] Change object types from AndroidCommands to DeviceUtils in build/android/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/pylib/gtest/setup.py

Issue 221823011: [Android] Change object types from AndroidCommands to DeviceUtils in build/android/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address Frank's comments. Created 6 years, 9 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

« build/android/pylib/device/device_utils.py ('K') | « build/android/pylib/forwarder.py ('k') | build/android/pylib/gtest/test_package.py » ('j') | build/android/pylib/linker/test_case.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: build/android/pylib/gtest/setup.py

diff --git a/build/android/pylib/gtest/setup.py b/build/android/pylib/gtest/setup.py

index e62b64811aaee30b04a749f73d98aa684f9b3bba..62889761e2907bf94e555eb4bcf87de5c7dbacc8 100644

--- a/build/android/pylib/gtest/setup.py

+++ b/build/android/pylib/gtest/setup.py

@@ -12,10 +12,9 @@ import os

import shutil

import sys

-from pylib import android_commands

from pylib import cmd_helper

from pylib import constants

+from pylib.device import adb_wrapper

from pylib.gtest import test_package_apk

from pylib.gtest import test_package_exe

from pylib.gtest import test_runner

@@ -219,8 +218,8 @@ def _GetTestsFromDevice(runner_factory, devices):

try:

logging.info('Obtaining tests from %s', device)

return runner_factory(device, 0).GetAllTests()

- except (android_commands.errors.WaitForResponseTimedOutError,

- android_commands.errors.DeviceUnresponsiveError), e:

+ except (adb_wrapper.CommandTimeoutError,

craigdh 2014/04/09 15:55:02 doesn't this need rebasing? I thought you changed

+ adb_wrapper.DeviceUnreachableError), e:

logging.warning('Failed obtaining test list from %s with exception: %s',

device, e)

raise Exception('Failed to obtain test list from devices.')

« build/android/pylib/device/device_utils.py ('K') | « build/android/pylib/forwarder.py ('k') | build/android/pylib/gtest/test_package.py » ('j') | build/android/pylib/linker/test_case.py » ('J')