Roll typ to v0.9.7.

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 73 matching lines @@
 
     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)
         if test_name in skipped_tests:
             value['expected'] = 'SKIP'
-            value['actual'] = 'SKIP'
         else:
             value['expected'] = 'PASS'
-            value['actual'] = _actual_results_for_test(test_name, results)
             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 = 'http://%s/testfile/upload' % test_results_server
@@ skipping 10 matching lines @@
 
 def num_failures(full_results):
     return full_results['num_failures_by_type']['FAIL']
 
 
 def failed_test_names(results):
     names = set()
     for r in results.results:
         if r.actual == ResultType.Failure:
             names.add(r.name)
-        elif r.actual == ResultType.Pass and r.name in names:
+        elif ((r.actual == ResultType.Pass or r.actual == ResultType.Skip)
+              and r.name in names):
+            # This check indicates that a test failed, and then either passed
+            # or was skipped on a retry. It is somewhat counterintuitive
+            # that a test that failed and then skipped wouldn't be considered
+            # 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):
     actuals = []
     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')
-
-    assert actuals, 'We did not find any result data for %s.' % test_name
+            elif r.actual == ResultType.Skip:
+                actuals.append('SKIP')
+    if not actuals:
+        actuals.append('SKIP')
     return ' '.join(actuals)
 
 
 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] = {}
@@ skipping 17 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