Index: scripts/slave/recipe_modules/test_results/api.py |
diff --git a/scripts/slave/recipe_modules/test_results/api.py b/scripts/slave/recipe_modules/test_results/api.py |
index 7fdbc333bf44c94c8aab50840484eb62be4a6de4..902405281d2c8780b8bf6a5d5511dd3a39e075c5 100644 |
--- a/scripts/slave/recipe_modules/test_results/api.py |
+++ b/scripts/slave/recipe_modules/test_results/api.py |
@@ -8,12 +8,13 @@ from recipe_engine import recipe_api |
class TestResultsApi(recipe_api.RecipeApi): |
"""Recipe module to upload gtest json results to test-results server.""" |
- def upload(self, gtest_results_file, test_type, chrome_revision, |
+ def upload(self, results_file, test_type, chrome_revision, |
test_results_server=None, downgrade_error_to_warning=True): |
"""Upload gtest results json to test-results. |
Args: |
- gtest_results_file: Path to file containing gtest json. |
+ results_file: Path to file containing test json (could be gtest format or |
+ full json result format). |
test_type: Test type string, e.g. webkit_tests. |
test_results_server: Server where results should be uploaded. |
downgrade_error_to_warning: If True, treat a failure to upload as a |
@@ -25,8 +26,8 @@ class TestResultsApi(recipe_api.RecipeApi): |
try: |
return self.m.python( |
name='Upload to test-results [%s]' % test_type, |
- script=self.resource('upload_gtest_test_results.py'), |
- args=['--input-gtest-json', gtest_results_file, |
+ script=self.resource('upload_test_results.py'), |
+ args=['--input-json', results_file, |
'--master-name', self.m.properties['mastername'], |
'--builder-name', self.m.properties['buildername'], |
'--build-number', self.m.properties['buildnumber'], |