Add metadata to json results before uploading

scripts/slave/recipe_modules/test_results/resources/upload_test_results_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for upload_test_results.py."""
 
 import json
 import os
 import shutil
@@ skipping 132 matching lines @@
     result_directory = tempfile.mkdtemp()
     try:
       input_json_file_path = os.path.join(result_directory, 'results.json')
       with open(input_json_file_path, 'w') as f:
         json.dump(contents, f)
       upload_test_results.main([
         '--test-type=foo',
         '--input-json=%s' % input_json_file_path,
         '--results-directory=%s' % result_directory,
         '--test-results-server=foo',
+        '--builder-name=hobbit',
+        '--build-number=1234',
+        '--chrome-revision=99999',
         '--master-name=sauron',
       ])
-      files = [(os.path.basename(input_json_file_path), input_json_file_path)]

[nednguyen, 2016/11/11 00:53:15]

I notice that this wasn't updated when you uploaded your previous CL. We will
need to move all these unittest to
scripts/slave/recipe_modules/test_results/resources/test/ or them to triggered
(https://cs.chromium.org/chromium/build/PRESUBMIT.py?rcl=0&l=119). I will do
that in a different CL.

[estaab, 2016/11/11 04:57:31]

Ah, thanks for fixing this.

+      uploaded_json_result_path = os.path.join(
+          result_directory, upload_test_results.FULL_RESULTS_FILENAME)
+
+      # Assert that metadata are added to the json results before uploading.
+      with open(uploaded_json_result_path) as f:
+        augmented_json = json.load(f)
+      self.assertEquals(augmented_json.get('master_name'), 'sauron')
+      self.assertEquals(augmented_json.get('builder_name'), 'hobbit')
+      self.assertEquals(augmented_json.get('build_number'), '1234')
+      self.assertEquals(augmented_json.get('chromium_revision'), '99999')
+
+      files = [('full_results.json', uploaded_json_result_path)]
       uploader_mock.assert_called_with(
           'foo',
-          [('builder', 'DUMMY_BUILDER_NAME'),
+          [('builder', 'hobbit'),
            ('testtype', 'foo'),
            ('master', 'sauron')], files, 120)
     finally:
       shutil.rmtree(result_directory)
 
 
-
 if __name__ == '__main__':
   unittest.main()