Index: build/android/pylib/base_test_runner.py |
diff --git a/build/android/pylib/base_test_runner.py b/build/android/pylib/base_test_runner.py |
index 8476664b18e2ea175498eb752c98597e99ad476b..55b5ac1c88caa59feccd00e51054b4f4bd0b8718 100644 |
--- a/build/android/pylib/base_test_runner.py |
+++ b/build/android/pylib/base_test_runner.py |
@@ -22,8 +22,7 @@ from valgrind_tools import CreateTool |
# A file on device to store ports of net test server. The format of the file is |
# test-spawner-server-port:test-server-port |
-NET_TEST_SERVER_PORT_INFO_FILE = \ |
- constants.TEST_DATA_DIR + '/net-test-server-ports' |
+NET_TEST_SERVER_PORT_INFO_FILE = 'net-test-server-ports' |
class BaseTestRunner(object): |
@@ -62,7 +61,8 @@ class BaseTestRunner(object): |
def _PushTestServerPortInfoToDevice(self): |
"""Pushes the latest port information to device.""" |
- self.adb.SetFileContents(NET_TEST_SERVER_PORT_INFO_FILE, |
+ self.adb.SetFileContents(self.adb.GetExternalStorage() + '/' + |
+ NET_TEST_SERVER_PORT_INFO_FILE, |
'%d:%d' % (self.test_server_spawner_port, |
self.test_server_port)) |
@@ -70,7 +70,9 @@ class BaseTestRunner(object): |
"""Calls subclass functions to set up tests, run them and tear them down. |
Returns: |
- Test results returned from RunTests(). |
+ Test results returned from RunTests(). TODO(tonyg): It looks like |
bulach
2012/09/24 10:40:49
a bit unfair to add somone else's todo :) feel fre
felipeg
2012/09/25 03:27:21
Sorry
this was a spurious diff that I copied from
|
+ different tests interpret this differently. Some return strings, others |
+ bools. We need to solidify this API. |
""" |
if not self.HasTests(): |
return True |
@@ -137,7 +139,7 @@ class BaseTestRunner(object): |
# Sometimes the forwarder device port may be already used. We have to kill |
# all forwarder processes to ensure that the forwarder can be started since |
# currently we can not associate the specified port to related pid. |
- self.adb.KillAll('forwarder') |
+ self.adb.KillAll('device_forwarder') |
if self._forwarder: |
self._forwarder.Close() |
self._forwarder = Forwarder( |
@@ -168,7 +170,7 @@ class BaseTestRunner(object): |
if self._forwarder or self._spawner_forwarder: |
# Kill all forwarders on the device and then kill the process on the host |
# (if it exists) |
- self.adb.KillAll('forwarder') |
+ self.adb.KillAll('device_forwarder') |
if self._forwarder: |
self._forwarder.Close() |
if self._spawner_forwarder: |