| 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 import re | 5 import re |
| 6 import string | 6 import string |
| 7 | 7 |
| 8 | 8 |
| 9 class Test(object): | 9 class Test(object): |
| 10 """ | 10 """ |
| (...skipping 827 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 api, suffix,test_filter=test_filter) | 838 api, suffix,test_filter=test_filter) |
| 839 finally: | 839 finally: |
| 840 step_result = api.step.active_result | 840 step_result = api.step.active_result |
| 841 # Only upload test results if we have gtest results. | 841 # Only upload test results if we have gtest results. |
| 842 if (self._upload_test_results and | 842 if (self._upload_test_results and |
| 843 hasattr(step_result, 'test_utils') and | 843 hasattr(step_result, 'test_utils') and |
| 844 hasattr(step_result.test_utils, 'gtest_results')): | 844 hasattr(step_result.test_utils, 'gtest_results')): |
| 845 gtest_results = getattr(step_result.test_utils, 'gtest_results', None) | 845 gtest_results = getattr(step_result.test_utils, 'gtest_results', None) |
| 846 if gtest_results and gtest_results.raw: | 846 if gtest_results and gtest_results.raw: |
| 847 parsed_gtest_data = gtest_results.raw | 847 parsed_gtest_data = gtest_results.raw |
| 848 chrome_revision_cp = api.bot_update.properties.get( | 848 chrome_revision_cp = api.bot_update.last_returned_properties.get( |
| 849 'got_revision_cp', 'x@{#0}') | 849 'got_revision_cp', 'x@{#0}') |
| 850 chrome_revision = str(api.commit_position.parse_revision( | 850 chrome_revision = str(api.commit_position.parse_revision( |
| 851 chrome_revision_cp)) | 851 chrome_revision_cp)) |
| 852 api.test_results.upload( | 852 api.test_results.upload( |
| 853 api.json.input(parsed_gtest_data), | 853 api.json.input(parsed_gtest_data), |
| 854 chrome_revision=chrome_revision, | 854 chrome_revision=chrome_revision, |
| 855 test_type=step_result.step['name'], | 855 test_type=step_result.step['name'], |
| 856 test_results_server='test-results.appspot.com') | 856 test_results_server='test-results.appspot.com') |
| 857 | 857 |
| 858 | 858 |
| (...skipping 1009 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1868 def run(self, api, suffix, test_filter=None): | 1868 def run(self, api, suffix, test_filter=None): |
| 1869 api.chromium_android.coverage_report(upload=False) | 1869 api.chromium_android.coverage_report(upload=False) |
| 1870 api.chromium_android.get_changed_lines_for_revision() | 1870 api.chromium_android.get_changed_lines_for_revision() |
| 1871 api.chromium_android.incremental_coverage_report() | 1871 api.chromium_android.incremental_coverage_report() |
| 1872 | 1872 |
| 1873 | 1873 |
| 1874 GOMA_TESTS = [ | 1874 GOMA_TESTS = [ |
| 1875 GTestTest('base_unittests'), | 1875 GTestTest('base_unittests'), |
| 1876 GTestTest('content_unittests'), | 1876 GTestTest('content_unittests'), |
| 1877 ] | 1877 ] |
| OLD | NEW |