| 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 import constants | 5 from pylib import constants |
| 6 from pylib.gtest import gtest_test_instance | 6 from pylib.gtest import gtest_test_instance |
| 7 from pylib.utils import isolator | 7 from pylib.utils import isolator |
| 8 from pylib.uirobot import uirobot_test_instance | 8 from pylib.uirobot import uirobot_test_instance |
| 9 | 9 |
| 10 | 10 |
| 11 | 11 |
| 12 def CreateTestInstance(args, error_func): | 12 def CreateTestInstance(args, error_func): |
| 13 | 13 |
| 14 if args.command == 'gtest': | 14 if args.command == 'gtest': |
| 15 return gtest_test_instance.GtestTestInstance( | 15 return gtest_test_instance.GtestTestInstance( |
| 16 args, isolator.Isolator(constants.ISOLATE_DEPS_DIR)) | 16 args, isolator.Isolator(constants.ISOLATE_DEPS_DIR), error_func) |
| 17 if args.command == 'uirobot': | 17 if args.command == 'uirobot': |
| 18 return uirobot_test_instance.UirobotTestInstance(args) | 18 return uirobot_test_instance.UirobotTestInstance(args) |
| 19 # TODO(jbudorick) Add instrumentation test instance. | 19 # TODO(jbudorick) Add instrumentation test instance. |
| 20 | 20 |
| 21 error_func('Unable to create %s test instance.' % args.command) | 21 error_func('Unable to create %s test instance.' % args.command) |
| OLD | NEW |