Roll typ v0.9.9 -> v0.9.11 (5822dda0..f6afa2bb).

third_party/typ/typ/json_results.py

 # Copyright 2014 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 72 matching lines @@
     skipped_tests = set(all_test_names) - passing_tests - failed_tests
 
     full_results['num_failures_by_type'] = OrderedDict()
     full_results['num_failures_by_type']['FAIL'] = len(failed_tests)
     full_results['num_failures_by_type']['PASS'] = len(passing_tests)
     full_results['num_failures_by_type']['SKIP'] = len(skipped_tests)
 
     full_results['tests'] = OrderedDict()
 
     for test_name in all_test_names:
-        value = OrderedDict()
-        value['actual'] = _actual_results_for_test(test_name, results)
+        value = _results_for_test(test_name, results)
         if test_name in skipped_tests:
             value['expected'] = 'SKIP'
         else:
             value['expected'] = 'PASS'
             if value['actual'].endswith('FAIL'):
                 value['is_unexpected'] = True
         _add_path_to_trie(full_results['tests'], test_name, value)
 
     return full_results
 
 
 def make_upload_request(test_results_server, builder, master, testtype,
                         full_results):
-    url = 'https://%s/testfile/upload' % test_results_server
+    if test_results_server.startswith('http'):
+        url = '%s/testfile/upload' % test_results_server
+    else:
+        url = 'https://%s/testfile/upload' % test_results_server
     attrs = [('builder', builder),
              ('master', master),
              ('testtype', testtype)]
     content_type, data = _encode_multipart_form_data(attrs, full_results)
     return url, content_type, data
 
 
 def exit_code_from_full_results(full_results):
     return 1 if num_failures(full_results) else 0
 
@@ skipping 15 matching lines @@
             # failed, but that's at least consistent with a test that is
             # skipped every time.
             names.remove(r.name)
     return names
 
 
 def _passing_test_names(results):
     return set(r.name for r in results.results if r.actual == ResultType.Pass)
 
 
-def _actual_results_for_test(test_name, results):
+def _results_for_test(test_name, results):
+    value = OrderedDict()
     actuals = []
+    times = []
     for r in results.results:
         if r.name == test_name:
             if r.actual == ResultType.Failure:
                 actuals.append('FAIL')
             elif r.actual == ResultType.Pass:
                 actuals.append('PASS')
             elif r.actual == ResultType.Skip:
                 actuals.append('SKIP')
+
+            # The time a test takes is a floating point number of seconds;
+            # if we were to encode this unmodified, then when we converted it
+            # to JSON it might make the file significantly larger. Instead
+            # we truncate the file to ten-thousandths of a second, which is
+            # probably more than good enough for most tests.
+            times.append(round(r.took, 4))
     if not actuals:  # pragma: untested
         actuals.append('SKIP')
-    return ' '.join(actuals)
-
+    value['actual'] = ' '.join(actuals)
+    value['times'] = times
+    return value
 
 def _add_path_to_trie(trie, path, value):
     if TEST_SEPARATOR not in path:
         trie[path] = value
         return
     directory, rest = path.split(TEST_SEPARATOR, 1)
     if directory not in trie:
         trie[directory] = {}
     _add_path_to_trie(trie[directory], rest, value)
 
@@ skipping 15 matching lines @@
                  'filename="full_results.json"')
     lines.append('Content-Type: application/json')
     lines.append('')
     lines.append(json.dumps(test_results))
 
     lines.append('--' + BOUNDARY + '--')
     lines.append('')
     body = CRLF.join(lines)
     content_type = 'multipart/form-data; boundary=%s' % BOUNDARY
     return content_type, body