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

Unified Diff: build/android/pylib/instrumentation/test_runner_test.py

Issue 762883002: Make device serial required in AdbWrapper/DeviceUtils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: renamed: exclude -> ignore Created 6 years 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 | « build/android/pylib/device/device_utils_test.py ('k') | build/android/pylib/utils/mock_calls.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/instrumentation/test_runner_test.py
diff --git a/build/android/pylib/instrumentation/test_runner_test.py b/build/android/pylib/instrumentation/test_runner_test.py
index 0f2845ea5bfab4f1ac9972efbc75b0c011776349..fda1e23435c937019414ad3cd1ca9b1c21be5977 100755
--- a/build/android/pylib/instrumentation/test_runner_test.py
+++ b/build/android/pylib/instrumentation/test_runner_test.py
@@ -27,7 +27,8 @@ class InstrumentationTestRunnerTest(unittest.TestCase):
options = mock.Mock()
options.tool = ''
package = mock.Mock()
- self.instance = test_runner.TestRunner(options, None, 0, package)
+ self.instance = test_runner.TestRunner(
+ options, '123456789abcdef0', 0, package)
def testParseAmInstrumentRawOutput_nothing(self):
code, result, statuses = (
@@ -226,6 +227,8 @@ class InstrumentationTestRunnerTest(unittest.TestCase):
'test': ['testMethod'],
}),
]
+ self.instance.device.old_interface.DismissCrashDialogIfNeeded = mock.Mock(
+ return_value=None)
result = self.instance._GenerateTestResult(
'test.package.TestClass#testMethod', statuses, 0, 1000)
self.assertEqual(base_test_result.ResultType.FAIL, result.GetType())
« no previous file with comments | « build/android/pylib/device/device_utils_test.py ('k') | build/android/pylib/utils/mock_calls.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698