Merge pull request #15345 from matt-kwong/rbe-upload

Handle timeouts when uploading ResultStore results

tools/run_tests/python_utils/upload_rbe_results.py

@@ -146,7 +146,15 @@ if __name__ == "__main__":
             test_cases = [{
                 'testCase': {
                     'caseName': str(action['id']['actionId']),
-                    'result': str(action['statusAttributes']['status'])
+                }
+            }]
+        # Test timeouts have a different dictionary structure compared to pass and
+        # fail results.
+        elif action['statusAttributes']['status'] == 'TIMED_OUT':
+            test_cases = [{
+                'testCase': {
+                    'caseName': str(action['id']['actionId']),
+                    'timedOut': True
                 }
             }]
         else:
@@ -155,6 +163,8 @@ if __name__ == "__main__":
         for test_case in test_cases:
             if 'errors' in test_case['testCase']:
                 result = 'FAILED'
+            elif 'timedOut' in test_case['testCase']:
+                result = 'TIMEOUT'
             else:
                 result = 'PASSED'
             bq_rows.append({