Chromium Code Reviews| Index: build/mobile/bling/pylib/uirobot/uirobot_test_instance.py |
| diff --git a/build/android/pylib/uirobot/uirobot_test_instance.py b/build/mobile/bling/pylib/uirobot/uirobot_test_instance.py |
| similarity index 67% |
| copy from build/android/pylib/uirobot/uirobot_test_instance.py |
| copy to build/mobile/bling/pylib/uirobot/uirobot_test_instance.py |
| index a531b414304b4860c0e787da2db5da9c41f11f70..5c250de5fdd44cdcb632bfdbdb37c8cfb872f93f 100644 |
| --- a/build/android/pylib/uirobot/uirobot_test_instance.py |
| +++ b/build/mobile/bling/pylib/uirobot/uirobot_test_instance.py |
| @@ -3,10 +3,14 @@ |
| # found in the LICENSE file. |
| import os |
| +import sys |
| from pylib import constants |
| + |
| +sys.path.append(os.path.join( |
| + constants.DIR_SOURCE_ROOT, 'build', 'android', 'pylib')) |
| + |
| from pylib.base import test_instance |
| -from pylib.utils import apk_helper |
| class UirobotTestInstance(test_instance.TestInstance): |
| @@ -17,11 +21,17 @@ 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: |
| + raise NotImplementedError |
|
rnephew (Wrong account)
2015/01/09 20:57:14
Need to know the correct default location for Blin
|
| + self._app_under_test = os.path.join( |
| + constants.GetOutDirectory(), 'apks/Chrome.apk') |
| + |
| self._minutes = args.minutes |
| - self._package_name = apk_helper.GetPackageName(self._apk_under_test) |
| - self._suite = 'Android Uirobot' |
| + self._package_name = self._app_under_test |
| + self._suite = 'iOS Uirobot' |
| #override |
| def TestType(self): |
| @@ -39,9 +49,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): |