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

Side by Side Diff: build/android/pylib/instrumentation/test_runner.py

Issue 371813005: [Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and SetProp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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 unified diff | Download patch
« no previous file with comments | « build/android/pylib/device_settings.py ('k') | build/android/pylib/perf/perf_control.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """Class for running instrumentation tests on a single device.""" 5 """Class for running instrumentation tests on a single device."""
6 6
7 import logging 7 import logging
8 import os 8 import os
9 import re 9 import re
10 import sys 10 import sys
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 logging.info('Taking screenshot named %s', screenshot_name) 144 logging.info('Taking screenshot named %s', screenshot_name)
145 self.device.old_interface.TakeScreenshot(screenshot_name) 145 self.device.old_interface.TakeScreenshot(screenshot_name)
146 146
147 def SetUp(self): 147 def SetUp(self):
148 """Sets up the test harness and device before all tests are run.""" 148 """Sets up the test harness and device before all tests are run."""
149 super(TestRunner, self).SetUp() 149 super(TestRunner, self).SetUp()
150 if not self.device.HasRoot(): 150 if not self.device.HasRoot():
151 logging.warning('Unable to enable java asserts for %s, non rooted device', 151 logging.warning('Unable to enable java asserts for %s, non rooted device',
152 str(self.device)) 152 str(self.device))
153 else: 153 else:
154 if self.device.old_interface.SetJavaAssertsEnabled(True): 154 if self.device.SetJavaAsserts(True):
155 # TODO(jbudorick) How to best do shell restart after the 155 # TODO(jbudorick) How to best do shell restart after the
156 # android_commands refactor? 156 # android_commands refactor?
157 self.device.RunShellCommand('stop') 157 self.device.RunShellCommand('stop')
158 self.device.RunShellCommand('start') 158 self.device.RunShellCommand('start')
159 159
160 # We give different default value to launch HTTP server based on shard index 160 # We give different default value to launch HTTP server based on shard index
161 # because it may have race condition when multiple processes are trying to 161 # because it may have race condition when multiple processes are trying to
162 # launch lighttpd with same port at same time. 162 # launch lighttpd with same port at same time.
163 self.LaunchTestHttpServer( 163 self.LaunchTestHttpServer(
164 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) 164 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
387 duration_ms = 0 387 duration_ms = 0
388 message = str(e) 388 message = str(e)
389 if not message: 389 if not message:
390 message = 'No information.' 390 message = 'No information.'
391 results.AddResult(test_result.InstrumentationTestResult( 391 results.AddResult(test_result.InstrumentationTestResult(
392 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms, 392 test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
393 log=message)) 393 log=message))
394 raw_result = None 394 raw_result = None
395 self.TestTeardown(test, raw_result) 395 self.TestTeardown(test, raw_result)
396 return (results, None if results.DidRunPass() else test) 396 return (results, None if results.DidRunPass() else test)
OLDNEW
« no previous file with comments | « build/android/pylib/device_settings.py ('k') | build/android/pylib/perf/perf_control.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698