diff options
| author | jbudorick <jbudorick@chromium.org> | 2014-12-15 10:59:23 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-15 19:00:08 +0000 |
| commit | 480f002f5478d6037aa8d1cb471207a1189deb23 (patch) | |
| tree | e4eb50317c3d4e9b0416c9523e1ad64cc958b75c /build | |
| parent | 6f899b27049b077e88582c0b73861d1db63e4512 (diff) | |
| download | chromium_src-480f002f5478d6037aa8d1cb471207a1189deb23.zip chromium_src-480f002f5478d6037aa8d1cb471207a1189deb23.tar.gz chromium_src-480f002f5478d6037aa8d1cb471207a1189deb23.tar.bz2 | |
[Android] Fix remote device test run TestPackage() methods.
BUG=428729
Review URL: https://codereview.chromium.org/801283005
Cr-Commit-Position: refs/heads/master@{#308382}
Diffstat (limited to 'build')
4 files changed, 11 insertions, 10 deletions
diff --git a/build/android/pylib/remote/device/remote_device_gtest_run.py b/build/android/pylib/remote/device/remote_device_gtest_run.py index fa8d5f9..5aa65ba 100644 --- a/build/android/pylib/remote/device/remote_device_gtest_run.py +++ b/build/android/pylib/remote/device/remote_device_gtest_run.py @@ -27,8 +27,9 @@ class RemoteDeviceGtestRun(remote_device_test_run.RemoteDeviceTestRun): DEFAULT_RUNNER_PACKAGE = ( 'org.chromium.native_test.ChromiumNativeTestInstrumentationTestRunner') + #override def TestPackage(self): - pass + return self._test_instance.suite #override def _TriggerSetUp(self): diff --git a/build/android/pylib/remote/device/remote_device_test_run.py b/build/android/pylib/remote/device/remote_device_test_run.py index 97e44b0..c7f1d98 100644 --- a/build/android/pylib/remote/device/remote_device_test_run.py +++ b/build/android/pylib/remote/device/remote_device_test_run.py @@ -41,9 +41,6 @@ class RemoteDeviceTestRun(test_run.TestRun): self._test_id = '' self._results = '' - def TestPackage(self): - pass - #override def RunTests(self): """Run the test.""" diff --git a/build/android/pylib/remote/device/remote_device_uirobot_run.py b/build/android/pylib/remote/device/remote_device_uirobot_run.py index d2d6f364..e4ebc38 100644 --- a/build/android/pylib/remote/device/remote_device_uirobot_run.py +++ b/build/android/pylib/remote/device/remote_device_uirobot_run.py @@ -34,8 +34,9 @@ class RemoteDeviceUirobotRun(remote_device_test_run.RemoteDeviceTestRun): """ super(RemoteDeviceUirobotRun, self).__init__(env, test_instance) + #override def TestPackage(self): - pass + return self._test_instance.package_name #override def _TriggerSetUp(self): diff --git a/build/android/pylib/uirobot/uirobot_test_instance.py b/build/android/pylib/uirobot/uirobot_test_instance.py index b129f89..9eba0acb 100644 --- a/build/android/pylib/uirobot/uirobot_test_instance.py +++ b/build/android/pylib/uirobot/uirobot_test_instance.py @@ -6,6 +6,7 @@ import os from pylib import constants from pylib.base import test_instance +from pylib.utils import apk_helper class UirobotTestInstance(test_instance.TestInstance): @@ -19,6 +20,7 @@ class UirobotTestInstance(test_instance.TestInstance): self._apk_under_test = os.path.join( constants.GetOutDirectory(), args.apk_under_test) self._minutes = args.minutes + self._package_name = apk_helper.GetPackageName(self._apk_under_test) #override def TestType(self): @@ -41,11 +43,11 @@ class UirobotTestInstance(test_instance.TestInstance): return self._apk_under_test @property - def suite(self): - """Returns the test suite, none for uirobot.""" - return None - - @property def minutes(self): """Returns the number of minutes to run the uirobot for.""" return self._minutes + + @property + def package_name(self): + """Returns the name of the package in the APK.""" + return self._package_name |