| 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.instrumentation import instrumentation_test_instance | 6 from pylib.instrumentation import instrumentation_test_instance |
| 7 from pylib.junit import junit_test_instance |
| 7 from pylib.local.device import local_device_environment | 8 from pylib.local.device import local_device_environment |
| 8 from pylib.local.device import local_device_gtest_run | 9 from pylib.local.device import local_device_gtest_run |
| 9 from pylib.local.device import local_device_instrumentation_test_run | 10 from pylib.local.device import local_device_instrumentation_test_run |
| 10 from pylib.local.device import local_device_perf_test_run | 11 from pylib.local.device import local_device_perf_test_run |
| 12 from pylib.local.machine import local_machine_environment |
| 13 from pylib.local.machine import local_machine_junit_test_run |
| 11 from pylib.perf import perf_test_instance | 14 from pylib.perf import perf_test_instance |
| 12 | 15 |
| 13 | 16 |
| 14 def _CreatePerfTestRun(args, env, test_instance): | 17 def _CreatePerfTestRun(args, env, test_instance): |
| 15 if args.print_step: | 18 if args.print_step: |
| 16 return local_device_perf_test_run.PrintStep( | 19 return local_device_perf_test_run.PrintStep( |
| 17 env, test_instance) | 20 env, test_instance) |
| 18 elif args.output_json_list: | 21 elif args.output_json_list: |
| 19 return local_device_perf_test_run.OutputJsonList( | 22 return local_device_perf_test_run.OutputJsonList( |
| 20 env, test_instance) | 23 env, test_instance) |
| 21 return local_device_perf_test_run.LocalDevicePerfTestRun( | 24 return local_device_perf_test_run.LocalDevicePerfTestRun( |
| 22 env, test_instance) | 25 env, test_instance) |
| 23 | 26 |
| 24 | 27 |
| 25 def CreateTestRun(args, env, test_instance, error_func): | 28 def CreateTestRun(args, env, test_instance, error_func): |
| 26 if isinstance(env, local_device_environment.LocalDeviceEnvironment): | 29 if isinstance(env, local_device_environment.LocalDeviceEnvironment): |
| 27 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): | 30 if isinstance(test_instance, gtest_test_instance.GtestTestInstance): |
| 28 return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance) | 31 return local_device_gtest_run.LocalDeviceGtestRun(env, test_instance) |
| 29 if isinstance(test_instance, | 32 if isinstance(test_instance, |
| 30 instrumentation_test_instance.InstrumentationTestInstance): | 33 instrumentation_test_instance.InstrumentationTestInstance): |
| 31 return (local_device_instrumentation_test_run | 34 return (local_device_instrumentation_test_run |
| 32 .LocalDeviceInstrumentationTestRun(env, test_instance)) | 35 .LocalDeviceInstrumentationTestRun(env, test_instance)) |
| 33 if isinstance(test_instance, | 36 if isinstance(test_instance, |
| 34 perf_test_instance.PerfTestInstance): | 37 perf_test_instance.PerfTestInstance): |
| 35 return _CreatePerfTestRun(args, env, test_instance) | 38 return _CreatePerfTestRun(args, env, test_instance) |
| 36 | 39 |
| 40 if isinstance(env, local_machine_environment.LocalMachineEnvironment): |
| 41 if isinstance(test_instance, junit_test_instance.JunitTestInstance): |
| 42 return (local_machine_junit_test_run |
| 43 .LocalMachineJunitTestRun(env, test_instance)) |
| 44 |
| 37 error_func('Unable to create test run for %s tests in %s environment' | 45 error_func('Unable to create test run for %s tests in %s environment' |
| 38 % (str(test_instance), str(env))) | 46 % (str(test_instance), str(env))) |
| 39 | 47 |
| OLD | NEW |