| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 import os |
| 6 import sys |
| 7 |
| 8 from pylib import constants |
| 5 from pylib.gtest import gtest_test_instance | 9 from pylib.gtest import gtest_test_instance |
| 6 from pylib.gtest import local_device_gtest_run | 10 from pylib.gtest import local_device_gtest_run |
| 7 from pylib.local.device import local_device_environment | 11 from pylib.local.device import local_device_environment |
| 8 from pylib.remote.device import remote_device_environment | 12 from pylib.remote.device import remote_device_environment |
| 9 from pylib.remote.device import remote_device_gtest_run | 13 from pylib.remote.device import remote_device_gtest_run |
| 10 from pylib.remote.device import remote_device_uirobot_run | 14 from pylib.remote.device import ( |
| 11 from pylib.uirobot import uirobot_test_instance | 15 remote_device_uirobot_run as android_remote_device_uirobot_run) |
| 16 from pylib.uirobot import uirobot_test_instance as android_uirobot_test_instance |
| 12 | 17 |
| 18 sys.path.append(os.path.join( |
| 19 constants.DIR_SOURCE_ROOT, 'build', 'mobile')) |
| 20 from bling.pylib.uirobot import ( |
| 21 uirobot_test_instance as ios_uirobot_test_instance) |
| 22 from bling.pylib.remote.device import ( |
| 23 remote_device_uirobot_run as ios_remote_device_uirobot_run) |
| 13 | 24 |
| 14 def CreateTestRun(_args, env, test_instance, error_func): | 25 def CreateTestRun(args, env, test_instance, error_func): |
| 15 if isinstance(env, local_device_environment.LocalDeviceEnvironment): | 26 if args.device_type == 'Android': |
| 16 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): | 27 if isinstance(env, local_device_environment.LocalDeviceEnvironment): |
| 17 return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance) | 28 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): |
| 29 return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance) |
| 18 | 30 |
| 19 if isinstance(env, remote_device_environment.RemoteDeviceEnvironment): | 31 if isinstance(env, remote_device_environment.RemoteDeviceEnvironment): |
| 20 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): | 32 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): |
| 21 return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance) | 33 return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance) |
| 22 if isinstance(test_instance, uirobot_test_instance.UirobotTestInstance): | 34 if isinstance(test_instance, |
| 23 return remote_device_uirobot_run.RemoteDeviceUirobotRun( | 35 android_uirobot_test_instance.UirobotTestInstance): |
| 24 env, test_instance) | 36 return android_remote_device_uirobot_run.RemoteDeviceUirobotRun( |
| 37 env, test_instance) |
| 38 |
| 39 if args.device_type == 'iOS': |
| 40 if isinstance(env, remote_device_environment.RemoteDeviceEnvironment): |
| 41 if isinstance(test_instance, |
| 42 ios_uirobot_test_instance.UirobotTestInstance): |
| 43 return ios_remote_device_uirobot_run.RemoteDeviceUirobotRun( |
| 44 env, test_instance) |
| 45 |
| 25 | 46 |
| 26 # TODO(jbudorick): Add local instrumentation test runs. | 47 # TODO(jbudorick): Add local instrumentation test runs. |
| 27 # TODO(rnephew): Add remote_device instrumentation test runs. | 48 # TODO(rnephew): Add remote_device instrumentation test runs. |
| 28 | 49 |
| 29 error_func('Unable to create test run for %s tests in %s environment' | 50 error_func('Unable to create test run for %s tests in %s environment' |
| 30 % (str(test_instance), str(env))) | 51 % (str(test_instance), str(env))) |
| 31 | 52 |
| OLD | NEW |