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 from pylib.gtest import gtest_test_instance | 5 from pylib.gtest import gtest_test_instance |
6 from pylib.gtest import local_device_gtest_run | 6 from pylib.gtest import local_device_gtest_run |
7 from pylib.instrumentation import instrumentation_test_instance | 7 from pylib.instrumentation import instrumentation_test_instance |
8 from pylib.local.device import local_device_environment | 8 from pylib.local.device import local_device_environment |
9 from pylib.local.device import local_device_instrumentation_test_run | 9 from pylib.local.device import local_device_instrumentation_test_run |
10 from pylib.remote.device import remote_device_environment | 10 from pylib.remote.device import remote_device_environment |
11 from pylib.remote.device import remote_device_gtest_run | 11 from pylib.remote.device import remote_device_gtest_run |
12 from pylib.remote.device import remote_device_instrumentation_run | |
12 from pylib.remote.device import remote_device_uirobot_run | 13 from pylib.remote.device import remote_device_uirobot_run |
13 from pylib.uirobot import uirobot_test_instance | 14 from pylib.uirobot import uirobot_test_instance |
14 | 15 |
15 | 16 |
16 def CreateTestRun(_args, env, test_instance, error_func): | 17 def CreateTestRun(_args, env, test_instance, error_func): |
17 if isinstance(env, local_device_environment.LocalDeviceEnvironment): | 18 if isinstance(env, local_device_environment.LocalDeviceEnvironment): |
18 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): | 19 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): |
19 return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance) | 20 return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance) |
20 if isinstance(test_instance, | 21 if isinstance(test_instance, |
21 instrumentation_test_instance.InstrumentationTestInstance): | 22 instrumentation_test_instance.InstrumentationTestInstance): |
22 return (local_device_instrumentation_test_run | 23 return (local_device_instrumentation_test_run |
23 .LocalDeviceInstrumentationTestRun(env, test_instance)) | 24 .LocalDeviceInstrumentationTestRun(env, test_instance)) |
24 | 25 |
25 if isinstance(env, remote_device_environment.RemoteDeviceEnvironment): | 26 if isinstance(env, remote_device_environment.RemoteDeviceEnvironment): |
26 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): | 27 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): |
27 return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance) | 28 return remote_device_gtest_run.RemoteDeviceGtestRun(env, test_instance) |
28 # TODO(rnephew): Add remote_device instrumentation test runs. | 29 # TODO(rnephew): Add remote_device instrumentation test runs. |
30 if isinstance(test_instance, | |
jbudorick
2015/01/16 20:44:14
style: either:
1) have a parameter on the first l
rnephew (Wrong account)
2015/01/16 21:39:27
Done.
| |
31 instrumentation_test_instance.InstrumentationTestInstance): | |
32 return (remote_device_instrumentation_run | |
33 .RemoteDeviceInstrumentationRun(env, test_instance)) | |
34 | |
29 if isinstance(test_instance, uirobot_test_instance.UirobotTestInstance): | 35 if isinstance(test_instance, uirobot_test_instance.UirobotTestInstance): |
30 return remote_device_uirobot_run.RemoteDeviceUirobotRun( | 36 return remote_device_uirobot_run.RemoteDeviceUirobotRun( |
31 env, test_instance) | 37 env, test_instance) |
32 | 38 |
33 | 39 |
34 error_func('Unable to create test run for %s tests in %s environment' | 40 error_func('Unable to create test run for %s tests in %s environment' |
35 % (str(test_instance), str(env))) | 41 % (str(test_instance), str(env))) |
36 | 42 |
OLD | NEW |