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.junit import junit_test_instance |
8 from pylib.monkey import monkey_test_instance | 8 from pylib.monkey import monkey_test_instance |
9 from pylib.perf import perf_test_instance | 9 from pylib.perf import perf_test_instance |
10 from pylib.utils import device_dependencies | 10 from pylib.utils import isolator |
11 | 11 |
12 | 12 |
13 def CreateTestInstance(args, error_func): | 13 def CreateTestInstance(args, error_func): |
14 | 14 |
15 if args.command == 'gtest': | 15 if args.command == 'gtest': |
16 return gtest_test_instance.GtestTestInstance( | 16 return gtest_test_instance.GtestTestInstance( |
17 args, device_dependencies.GetDataDependencies, error_func) | 17 args, isolator.Isolator(), error_func) |
18 elif args.command == 'instrumentation': | 18 elif args.command == 'instrumentation': |
19 return instrumentation_test_instance.InstrumentationTestInstance( | 19 return instrumentation_test_instance.InstrumentationTestInstance( |
20 args, device_dependencies.GetDataDependencies, error_func) | 20 args, isolator.Isolator(), error_func) |
21 elif args.command == 'junit': | 21 elif args.command == 'junit': |
22 return junit_test_instance.JunitTestInstance(args, error_func) | 22 return junit_test_instance.JunitTestInstance(args, error_func) |
23 elif args.command == 'monkey': | 23 elif args.command == 'monkey': |
24 return monkey_test_instance.MonkeyTestInstance(args, error_func) | 24 return monkey_test_instance.MonkeyTestInstance(args, error_func) |
25 elif args.command == 'perf': | 25 elif args.command == 'perf': |
26 return perf_test_instance.PerfTestInstance(args, error_func) | 26 return perf_test_instance.PerfTestInstance(args, error_func) |
27 | 27 |
28 error_func('Unable to create %s test instance.' % args.command) | 28 error_func('Unable to create %s test instance.' % args.command) |
OLD | NEW |