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

Side by Side Diff: build/android/pylib/uiautomator/test_runner.py

Issue 444243002: Test Runner changes for Integration tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Path fix + UIAutomator Created 6 years, 4 months 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 """Class for running uiautomator tests on a single device.""" 5 """Class for running uiautomator tests on a single device."""
6 6
7 from pylib import constants 7 from pylib import constants
8 from pylib import flag_changer 8 from pylib import flag_changer
9 from pylib.device import intent 9 from pylib.device import intent
10 from pylib.instrumentation import test_options as instr_test_options 10 from pylib.instrumentation import test_options as instr_test_options
(...skipping 22 matching lines...) Expand all
33 test_options.test_filter, 33 test_options.test_filter,
34 test_options.test_data, 34 test_options.test_data,
35 test_options.save_perf_json, 35 test_options.save_perf_json,
36 test_options.screenshot_failures, 36 test_options.screenshot_failures,
37 wait_for_debugger=False, 37 wait_for_debugger=False,
38 coverage_dir=None, 38 coverage_dir=None,
39 test_apk=None, 39 test_apk=None,
40 test_apk_path=None, 40 test_apk_path=None,
41 test_apk_jar_path=None, 41 test_apk_jar_path=None,
42 test_runner=None, 42 test_runner=None,
43 test_support_apk_path=None) 43 test_support_apk_path=None,
44 device_flags=None)
44 super(TestRunner, self).__init__(instrumentation_options, device, 45 super(TestRunner, self).__init__(instrumentation_options, device,
45 shard_index, test_pkg) 46 shard_index, test_pkg)
46 47
47 cmdline_file = constants.PACKAGE_INFO[test_options.package].cmdline_file 48 cmdline_file = constants.PACKAGE_INFO[test_options.package].cmdline_file
48 self.flags = None 49 self.flags = None
49 if cmdline_file: 50 if cmdline_file:
50 self.flags = flag_changer.FlagChanger(self.device, cmdline_file) 51 self.flags = flag_changer.FlagChanger(self.device, cmdline_file)
51 self._package = constants.PACKAGE_INFO[test_options.package].package 52 self._package = constants.PACKAGE_INFO[test_options.package].package
52 self._activity = constants.PACKAGE_INFO[test_options.package].activity 53 self._activity = constants.PACKAGE_INFO[test_options.package].activity
53 54
(...skipping 14 matching lines...) Expand all
68 else: 69 else:
69 self.flags.AddFlags(['--disable-fre']) 70 self.flags.AddFlags(['--disable-fre'])
70 self.device.StartActivity( 71 self.device.StartActivity(
71 intent.Intent(action='android.intent.action.MAIN', 72 intent.Intent(action='android.intent.action.MAIN',
72 activity=self._activity, 73 activity=self._activity,
73 package=self._package), 74 package=self._package),
74 blocking=True, 75 blocking=True,
75 force_stop=True) 76 force_stop=True)
76 return self.device.old_interface.RunUIAutomatorTest( 77 return self.device.old_interface.RunUIAutomatorTest(
77 test, self.test_pkg.GetPackageName(), timeout) 78 test, self.test_pkg.GetPackageName(), timeout)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698