Chromium Code Reviews| Index: scripts/slave/recipe_modules/chromium_tests/steps.py |
| diff --git a/scripts/slave/recipe_modules/chromium_tests/steps.py b/scripts/slave/recipe_modules/chromium_tests/steps.py |
| index f72c60b75275bdab49b4357fb2728bd920947b48..b7e00856ac15a933e3c43c56ed3bdc7d0e9b7f5d 100644 |
| --- a/scripts/slave/recipe_modules/chromium_tests/steps.py |
| +++ b/scripts/slave/recipe_modules/chromium_tests/steps.py |
| @@ -3,6 +3,8 @@ |
| # found in the LICENSE file. |
| import datetime |
| +import logging |
| +import os |
| import re |
| import string |
| @@ -1747,7 +1749,53 @@ class FindAnnotatedTest(Test): |
| '%s-android-chrome.json' % timestamp_string), |
| 'chromium-annotated-tests', 'android') |
| +class BlimpIntegrationScriptTest(Test): |
| + """ |
| + Test which runs with Blimp client and engine connecting environment. |
| + |
| + This sets up Blimp client and engine integration script initially, |
| + and cleans up the environment after test ends. |
| + """ |
| + @staticmethod |
| + def compile_targets(api): |
| + """List of compile targets needed by this test.""" |
| + return ['blimp'] |
| + |
| + def run(self, api, suffix, test_filter=None): |
| + api.chromium.set_config('chromium', TARGET_PLATFORM='linux') |
|
jbudorick
2016/08/26 21:22:37
I don't think a Test step is the right place for t
|
| + api.chromium.run_gn(use_goma=True) |
| + api.chromium.compile(targets=['blimp']) |
| + |
| + test_path = api.path['checkout'].join('blimp', 'tools', |
| + 'client_engine_integration.py') |
| + json_file_path = api.path['checkout'].join('blimp', 'tools', 'blimp_script_args.json') |
| + output_path = api.path['checkout'].join('out-linux', 'Debug') |
| + blimp_apk_path = api.path['checkout'].join('out-android', 'Debug', 'Blimp.apk') |
|
jbudorick
2016/08/26 21:22:37
wouldn't this be out-android/Debug/apks/Blimp.apk?
|
| + |
| + try: |
| + args = ['--output-linux-directory', str(output_path), |
| + 'start'] |
| + api.python( |
| + 'client_engine_integration.py start', |
| + test_path, |
| + args=args) |
| + # Blimp Engine Starts |
| + args = ['--output-linux-directory', str(output_path), |
| + 'load', |
| + '--apk-path', str(blimp_apk_path)] |
| + api.python( |
|
jbudorick
2016/08/26 21:22:38
I'd like this to be a bit more general s.t. we can
|
| + 'client_engine_integration.py load', |
| + test_path, |
| + args=args) |
| + finally: |
| + args = ['--output-linux-directory', str(output_path), |
| + 'stop'] |
| + api.python( |
| + 'client_engine_integration.py stop', |
| + test_path, |
| + args=args) |
| + |
| GOMA_TESTS = [ |
| GTestTest('base_unittests'), |
| GTestTest('content_unittests'), |
| -] |
| +] |