Index: scripts/slave/recipe_modules/test_results/resources/upload_test_results_unittest.py |
diff --git a/scripts/slave/recipe_modules/test_results/resources/upload_test_results_unittest.py b/scripts/slave/recipe_modules/test_results/resources/upload_test_results_unittest.py |
index b5f70ede0fb5f93cad31a7d6bcd56f73404d9bd4..e0724172de93a3e0364f7bc53d063b5c355f58ad 100755 |
--- a/scripts/slave/recipe_modules/test_results/resources/upload_test_results_unittest.py |
+++ b/scripts/slave/recipe_modules/test_results/resources/upload_test_results_unittest.py |
@@ -150,18 +150,31 @@ class UploadTestResultsTest(unittest.TestCase): |
'--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 uploade
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() |