diff options
| author | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-02 10:01:11 +0000 |
|---|---|---|
| committer | qsr@chromium.org <qsr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-02 10:01:11 +0000 |
| commit | 29286df7fcaba3f94c63c1ac9dd6ff5896623871 (patch) | |
| tree | 0d15a1a29b458cda76dd10b68b8ebe59ff4adcf6 /build | |
| parent | 9552fcfe0a9476213739d6e1807f408fab58bcaa (diff) | |
| download | chromium_src-29286df7fcaba3f94c63c1ac9dd6ff5896623871.zip chromium_src-29286df7fcaba3f94c63c1ac9dd6ff5896623871.tar.gz chromium_src-29286df7fcaba3f94c63c1ac9dd6ff5896623871.tar.bz2 | |
Fix options passing.
TBR=gkanwar@chromium.org,bulach@chromium.org
Review URL: https://codereview.chromium.org/21793002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/pylib/uiautomator/test_runner.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/android/pylib/uiautomator/test_runner.py b/build/android/pylib/uiautomator/test_runner.py index 39ed5ec..74e887d 100644 --- a/build/android/pylib/uiautomator/test_runner.py +++ b/build/android/pylib/uiautomator/test_runner.py @@ -4,7 +4,7 @@ """Class for running uiautomator tests on a single device.""" -from pylib.instrumentation import test_options +from pylib.instrumentation import test_options as instr_test_options from pylib.instrumentation import test_runner as instr_test_runner @@ -24,7 +24,7 @@ class TestRunner(instr_test_runner.TestRunner): Can be optionally requested by a test case. """ # Create an InstrumentationOptions object to pass to the super class - instrumentation_options = test_options.InstrumentationOptions( + instrumentation_options = instr_test_options.InstrumentationOptions( test_options.build_type, test_options.tool, test_options.cleanup_test_files, @@ -37,7 +37,9 @@ class TestRunner(instr_test_runner.TestRunner): test_options.screenshot_failures, test_options.disable_assertions, wait_for_debugger=False, - test_apk=None) + test_apk=None, + test_apk_path=None, + test_apk_jar_path=None) super(TestRunner, self).__init__(instrumentation_options, device, shard_index, test_pkg, ports_to_forward) |