Rename upload_gtest_test_results.py to upload_test_results.py.

scripts/slave/recipe_modules/test_results/api.py

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..7481cbf6b69f5cd33f2f863fee6df5c41f5f654b 100644
--- a/scripts/slave/recipe_modules/test_results/api.py
+++ b/scripts/slave/recipe_modules/test_results/api.py
@@ -8,12 +8,14 @@ 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,

[Paweł Hajdan Jr., 2016/10/11 16:36:26]

It seems useful to have explicit way of knowing type of results we're uploading.

I'm generally skeptical about possible auto-detection (is that the plan?).

What's the advantage otherwise? What code would be shared? Why not extract
shared parts to a module?

[estaab, 2016/10/13 15:46:39]

I agree with Paweł, this should have been explicit. Callers should be conscious
of the distinction since the behavior is very different for the different use
cases (converting formats vs uploading raw).

[nednguyen, 2016/10/13 15:54:35]

I don't find how splitting the uploader into 2 scripts: one convert format +
upload and another one only uploading will make it simpler.

I think the bug is the uploader script is doing too much here: both converting
format & uploading. 

If you want, I can move the format converting logic out of
upload_test_results.py. Maybe move the formatting logic to test_results/api.py,
wdyt?

[estaab, 2016/10/20 04:56:41]

Sorry, I didn't mean that we need multiple scripts. I would be happy with 2
optional parameters where users set one or the other to upload() and to
upload_test_results.py: a gtest_json and a test_results_json (--gtest-input-json
and --test-results-input-json).

I think it's not worth spending more than 30 minutes changing it at this point
since it doesn't matter that much. The logging you mentioned sounds like a good
compromise and printing "parsed as the gtest json format" or something along
those lines would speed up debugging.

              test_results_server=None, downgrade_error_to_warning=True):
-    """Upload gtest results json to test-results.
+    """Upload results json to test-results.
 
     Args:
-      gtest_results_file: Path to file containing gtest json.
+      results_file: Path to file containing result json. Supported format are:
+        ttest format & full json results format (
+        http://www.chromium.org/developers/the-json-test-results-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 +27,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,

[ghost stip (do not use), 2016/10/13 07:49:20]

this broke test uploading for android. should we revert?

                 '--master-name', self.m.properties['mastername'],
                 '--builder-name', self.m.properties['buildername'],
                 '--build-number', self.m.properties['buildnumber'],