Chromium Code Reviews| Index: build/android/pylib/uirobot/uirobot_test_instance.py |
| diff --git a/build/android/pylib/uirobot/uirobot_test_instance.py b/build/android/pylib/uirobot/uirobot_test_instance.py |
| index a531b414304b4860c0e787da2db5da9c41f11f70..0a2dfdf3e6476b662b53d0d4fc6f5ecabaaef91a 100644 |
| --- a/build/android/pylib/uirobot/uirobot_test_instance.py |
| +++ b/build/android/pylib/uirobot/uirobot_test_instance.py |
| @@ -10,6 +10,8 @@ from pylib.utils import apk_helper |
| class UirobotTestInstance(test_instance.TestInstance): |
| + DEFAULT_CHROME_APK = 'apks/Chrome.apk' |
| + |
| def __init__(self, args): |
| """Constructor. |
| @@ -17,10 +19,15 @@ class UirobotTestInstance(test_instance.TestInstance): |
| args: Command line arguments. |
| """ |
| super(UirobotTestInstance, self).__init__() |
| - self._apk_under_test = os.path.join( |
| - constants.GetOutDirectory(), args.apk_under_test) |
| + if args.app_under_test: |
| + self._app_under_test = os.path.join( |
| + constants.GetOutDirectory(), args.app_under_test) |
| + else: |
| + self._app_under_test = os.path.join( |
|
jbudorick
2015/01/09 22:06:50
I don't think we should provide a default for this
rnephew (Wrong account)
2015/01/09 23:35:36
Done.
|
| + constants.GetOutDirectory(), self.DEFAULT_CHROME_APK) |
| + |
| self._minutes = args.minutes |
| - self._package_name = apk_helper.GetPackageName(self._apk_under_test) |
| + self._package_name = apk_helper.GetPackageName(self._app_under_test) |
| self._suite = 'Android Uirobot' |
| #override |
| @@ -39,9 +46,9 @@ class UirobotTestInstance(test_instance.TestInstance): |
| pass |
| @property |
| - def apk_under_test(self): |
| + def app_under_test(self): |
| """Returns the app to run the test on.""" |
| - return self._apk_under_test |
| + return self._app_under_test |
| @property |
| def minutes(self): |