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

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

Issue 1290773009: [Android] Remove android_commands and android_testrunner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: msg3: sullivan comment Created 5 years, 4 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/gtest/test_package_apk.py ('k') | build/android/pylib/system_properties.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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 self.device.TakeScreenshot(screenshot_name) 89 self.device.TakeScreenshot(screenshot_name)
90 90
91 def SetUp(self): 91 def SetUp(self):
92 """Sets up the test harness and device before all tests are run.""" 92 """Sets up the test harness and device before all tests are run."""
93 super(TestRunner, self).SetUp() 93 super(TestRunner, self).SetUp()
94 if not self.device.HasRoot(): 94 if not self.device.HasRoot():
95 logging.warning('Unable to enable java asserts for %s, non rooted device', 95 logging.warning('Unable to enable java asserts for %s, non rooted device',
96 str(self.device)) 96 str(self.device))
97 else: 97 else:
98 if self.device.SetJavaAsserts(self.options.set_asserts): 98 if self.device.SetJavaAsserts(self.options.set_asserts):
99 # TODO(jbudorick) How to best do shell restart after the
100 # android_commands refactor?
101 self.device.RunShellCommand('stop') 99 self.device.RunShellCommand('stop')
102 self.device.RunShellCommand('start') 100 self.device.RunShellCommand('start')
103 self.device.WaitUntilFullyBooted() 101 self.device.WaitUntilFullyBooted()
104 102
105 # We give different default value to launch HTTP server based on shard index 103 # We give different default value to launch HTTP server based on shard index
106 # because it may have race condition when multiple processes are trying to 104 # because it may have race condition when multiple processes are trying to
107 # launch lighttpd with same port at same time. 105 # launch lighttpd with same port at same time.
108 self.LaunchTestHttpServer( 106 self.LaunchTestHttpServer(
109 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port) 107 os.path.join(constants.DIR_SOURCE_ROOT), self._lighttp_port)
110 if self.flags: 108 if self.flags:
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 except device_errors.CommandTimeoutError as e: 363 except device_errors.CommandTimeoutError as e:
366 results.AddResult(test_result.InstrumentationTestResult( 364 results.AddResult(test_result.InstrumentationTestResult(
367 test, base_test_result.ResultType.TIMEOUT, start_ms, duration_ms, 365 test, base_test_result.ResultType.TIMEOUT, start_ms, duration_ms,
368 log=str(e) or 'No information')) 366 log=str(e) or 'No information'))
369 except device_errors.DeviceUnreachableError as e: 367 except device_errors.DeviceUnreachableError as e:
370 results.AddResult(test_result.InstrumentationTestResult( 368 results.AddResult(test_result.InstrumentationTestResult(
371 test, base_test_result.ResultType.CRASH, start_ms, duration_ms, 369 test, base_test_result.ResultType.CRASH, start_ms, duration_ms,
372 log=str(e) or 'No information')) 370 log=str(e) or 'No information'))
373 self.TestTeardown(test, results) 371 self.TestTeardown(test, results)
374 return (results, None if results.DidRunPass() else test) 372 return (results, None if results.DidRunPass() else test)
OLDNEW
« no previous file with comments | « build/android/pylib/gtest/test_package_apk.py ('k') | build/android/pylib/system_properties.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698