Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(681)

Side by Side Diff: build/android/pylib/base/test_instance_factory.py

Issue 812543002: Update from https://crrev.com/308331 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « build/android/pylib/base/environment_factory.py ('k') | build/android/pylib/base/test_run.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
9
8 10
9 11
10 def CreateTestInstance(args, error_func): 12 def CreateTestInstance(args, error_func):
11 13
12 if args.command == 'gtest': 14 if args.command == 'gtest':
13 return gtest_test_instance.GtestTestInstance( 15 return gtest_test_instance.GtestTestInstance(
14 args, isolator.Isolator(constants.ISOLATE_DEPS_DIR)) 16 args, isolator.Isolator(constants.ISOLATE_DEPS_DIR))
17 if args.command == 'uirobot':
18 return uirobot_test_instance.UirobotTestInstance(args)
15 # TODO(jbudorick) Add instrumentation test instance. 19 # TODO(jbudorick) Add instrumentation test instance.
16 20
17 error_func('Unable to create %s test instance.' % args.command) 21 error_func('Unable to create %s test instance.' % args.command)
18
OLDNEW
« no previous file with comments | « build/android/pylib/base/environment_factory.py ('k') | build/android/pylib/base/test_run.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698