[Findit] Fix bug when displaying try job result for swamring tests.

appengine/findit/handlers/test/handlers_util_test.py

 # Copyright 2016 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.
 
 from testing_utils import testing
 
 from handlers import handlers_util
 from model.wf_analysis import WfAnalysis
 from model import wf_analysis_status
 from model.wf_swarming_task import WfSwarmingTask
@@ skipping 181 matching lines @@
     analysis.failure_result_map = {
         'compile': 'm/b/121'
     }
     analysis.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
         'compile': {
-            'step': 'compile',
-            'test': 'N/A',
+            'step_name': 'compile',
+            'test_name': 'N/A',
             'try_job_key': 'm/b/121'
         }
     }
 
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultOnlyReturnStatusIfPending(self):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, self.build_number)
     analysis.failure_result_map = {
         'compile': 'm/b/121'
     }
     analysis.put()
 
     try_job = WfTryJob.Create(
         self.master_name, self.builder_name, self.build_number)
     try_job.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
         'compile': {
-            'step': 'compile',
-            'test': 'N/A',
+            'step_name': 'compile',
+            'test_name': 'N/A',
             'try_job_key': 'm/b/121',
             'status': 'Pending'
         }
     }
 
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultOnlyReturnUrlIfStarts(self):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, self.build_number)
@@ skipping 12 matching lines @@
                     'builders/linux_chromium_variable/builds/121')
         }
     ]
     try_job.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
         'compile': {
-            'step': 'compile',
-            'test': 'N/A',
+            'step_name': 'compile',
+            'test_name': 'N/A',
             'try_job_key': 'm/b/121',
             'status': 'Running',
             'try_job_build_number': 121,
             'try_job_url': ('http://build.chromium.org/p/tryserver.chromium.'
                             'linux/builders/linux_chromium_variable/builds/121')
         }
     }
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultOnlyReturnStatusIfError(self):
@@ skipping 12 matching lines @@
             'try_job_id': '1'
         }
     ]
     try_job.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
         'compile': {
-            'step': 'compile',
-            'test': 'N/A',
+            'step_name': 'compile',
+            'test_name': 'N/A',
             'try_job_key': 'm/b/121',
             'status': 'Error'
         }
     }
 
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultWhenTryJobCompleted(self):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, self.build_number)
@@ skipping 23 matching lines @@
             }
         }
     ]
     try_job.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
         'compile': {
-            'step': 'compile',
-            'test': 'N/A',
+            'step_name': 'compile',
+            'test_name': 'N/A',
             'try_job_key': 'm/b/121',
             'try_job_build_number': 121,
             'status': 'Completed',
             'try_job_url': (
                 'http://build.chromium.org/p/tryserver.chromium.linux/'
                 'builders/linux_chromium_variable/builds/121'),
             'revision': 'rev2',
             'commit_position': '2',
             'review_url': 'url_2'
         }
@@ skipping 22 matching lines @@
                     'builders/linux_chromium_variable/builds/121')
         }
     ]
     try_job.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
         'compile': {
-            'step': 'compile',
-            'test': 'N/A',
+            'step_name': 'compile',
+            'test_name': 'N/A',
             'try_job_key': 'm/b/121',
             'try_job_build_number': 121,
             'status': 'Completed',
             'try_job_url': (
                 'http://build.chromium.org/p/tryserver.chromium.linux/'
                 'builders/linux_chromium_variable/builds/121')
         }
     }
 
     self.assertEqual(expected_result, result)
 
   def testGetTryJobResultWhenTryJobForTestCompleted(self):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, self.build_number)
     analysis.failure_result_map = {
-        'a_test': {
+        'a_test on platform': {
             'a_test1': 'm/b/121',
             'a_test2': 'm/b/121',
             'a_test3': 'm/b/120',
             'a_test4': 'm/b/121'
         },
-        'b_test': {
+        'b_test_on_platform': {
             'b_test1': 'm/b/121'
         },
         'c_test': 'm/b/121',
         'd_test': 'm/b/122'
     }
     analysis.put()
 
     task_120_a = WfSwarmingTask.Create(
-        self.master_name, self.builder_name, 120, 'a_test')
+        self.master_name, self.builder_name, 120, 'a_test on platform')
     task_120_a.tests_statuses = {
         'a_test3': {
             'total_run': 1,
             'FAILURE': 1
         }
     }
     task_120_a.put()
 
     task_121_a = WfSwarmingTask.Create(
-        self.master_name, self.builder_name, self.build_number, 'a_test')
+        self.master_name, self.builder_name, self.build_number,
+        'a_test on platform')
     task_121_a.tests_statuses = {
         'a_test1': {
             'total_run': 1,
             'FAILURE': 1
         },
         'a_test2': {
             'total_run': 1,
             'FAILURE': 1
         },
         'a_test4': {
             'total_run': 1,
             'SUCCESS': 1
         }
     }
     task_121_a.put()
 
     task_121_b = WfSwarmingTask.Create(
-        self.master_name, self.builder_name, self.build_number, 'b_test')
+        self.master_name, self.builder_name, self.build_number,
+        'b_test_on_platform')
     task_121_b.tests_statuses = {
         'b_test1': {
             'total_run': 1,
             'SUCCESS': 1
         }
     }
+    task_121_b.parameters = {
+        'ref_name': 'b_test'
+    }
     task_121_b.put()
 
     try_job_120 = WfTryJob.Create(
         self.master_name, self.builder_name, 120)
     try_job_120.status = wf_analysis_status.ANALYZED
     try_job_120.test_results = [
         {
             'result': {
                 'rev0': {
                     'a_test': {
@@ skipping 93 matching lines @@
                     'builders/linux_chromium_variable/builds/122'),
             'try_job_id': '2'
         }
     ]
     try_job_122.put()
 
     result = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     expected_result = {
-        'a_test-a_test1': {
-            'step': 'a_test',
-            'test': 'a_test1',
+        'a_test on platform-a_test1': {
+            'step_name': 'a_test on platform',
+            'test_name': 'a_test1',
+            'step_no_platform': 'a_test',
             'try_job_key': 'm/b/121',
             'try_job_build_number': 121,
             'status': 'Completed',
             'try_job_url': (
                 'http://build.chromium.org/p/tryserver.chromium.linux/'
                 'builders/linux_chromium_variable/builds/121'),
             'revision': 'rev1',
             'commit_position': '1',
             'review_url': 'url_1'
         },
-        'a_test-a_test2': {
-            'step': 'a_test',
-            'test': 'a_test2',
+        'a_test on platform-a_test2': {
+            'step_name': 'a_test on platform',
+            'test_name': 'a_test2',
+            'step_no_platform': 'a_test',
             'try_job_key': 'm/b/121',
             'status': 'Completed',
             'try_job_build_number': 121,
             'try_job_url': (
                 'http://build.chromium.org/p/tryserver.chromium.linux/'
                 'builders/linux_chromium_variable/builds/121')
         },
-        'a_test-a_test3': {
-            'step': 'a_test',
-            'test': 'a_test3',
+        'a_test on platform-a_test3': {
+            'step_name': 'a_test on platform',
+            'test_name': 'a_test3',
+            'step_no_platform': 'a_test',
             'try_job_key': 'm/b/120',
             'try_job_build_number': 120,
             'status': 'Completed',
             'try_job_url': (
                 'http://build.chromium.org/p/tryserver.chromium.linux/'
                 'builders/linux_chromium_variable/builds/120'),
             'revision': 'rev0',
             'commit_position': '0',
             'review_url': 'url_0'
         },
-        'a_test-a_test4': {
-            'step': 'a_test',
-            'test': 'a_test4',
+        'a_test on platform-a_test4': {
+            'step_name': 'a_test on platform',
+            'test_name': 'a_test4',
+            'step_no_platform': 'a_test',
             'try_job_key': 'm/b/121',
             'status': 'Flaky'
         },
-        'b_test-b_test1': {
-            'step': 'b_test',
-            'test': 'b_test1',
+        'b_test_on_platform-b_test1': {
+            'step_name': 'b_test_on_platform',
+            'test_name': 'b_test1',
+            'step_no_platform': 'b_test',
             'try_job_key': 'm/b/121',
             'status': 'Flaky'
         },
         'c_test': {
-            'step': 'c_test',
-            'test': 'N/A',
+            'step_name': 'c_test',
+            'test_name': 'N/A',
             'try_job_key': 'm/b/121',
             'try_job_build_number': 121,
             'status': 'Completed',
             'try_job_url': (
                 'http://build.chromium.org/p/tryserver.chromium.linux/'
                 'builders/linux_chromium_variable/builds/121'),
             'revision': 'rev2',
             'commit_position': '2',
             'review_url': 'url_2'
         },
         'd_test': {
-            'step': 'd_test',
-            'test': 'N/A',
+            'step_name': 'd_test',
+            'test_name': 'N/A',
             'try_job_key': 'm/b/122',
             'try_job_build_number': 122,
             'status': 'Completed',
             'try_job_url': (
                 'http://build.chromium.org/p/tryserver.chromium.linux/'
                 'builders/linux_chromium_variable/builds/122')
         }
     }
     self.assertEqual(expected_result, result)
 
-  def testUpdateFlakinessNoTask(self):
+  def testUpdateTryJobCulpritUsingSwarmingTaskNoTask(self):
     step_name = 's'
     failure_key_set = ['m/b/1']
     culprits_info = None
-    handlers_util._UpdateFlakiness(step_name, failure_key_set, culprits_info)
+    handlers_util._UpdateTryJobCulpritUsingSwarmingTask(
+        step_name, failure_key_set, culprits_info)
     self.assertIsNone(culprits_info)
 
   def testGetCulpritInfoForTryJobResultStep(self):
     try_job_key = 'm/b/120'
     culprits_info = {
-        'a_test': {
-            'step': 'a_test',
-            'test': 'N/A',
+        'a_test on platform': {
+            'step_name': 'a_test on platform',
+            'test_name': 'N/A',
             'try_job_key': try_job_key
         }
     }
 
     try_job_120 = WfTryJob.Create(
         self.master_name, self.builder_name, 120)
     try_job_120.status = wf_analysis_status.ANALYZED
     try_job_120.test_results = [
         {
             'result': {
                 'rev0': {
-                    'a_test': {
+                    'a_test on platform': {
                         'status': 'failed',
                         'valid': True,
                         'failures': ['a_test3']
                     }
                 }
             },
             'url': ('http://build.chromium.org/p/tryserver.chromium.linux/'
                     'builders/linux_chromium_variable/builds/120'),
             'try_job_id': '0',
             'culprit': {
-                'a_test': {
+                'a_test on platform': {
                     'tests': {
                         'a_test3': {
                             'revision': 'rev0',
                             'commit_position': '0',
                             'review_url': 'url_0'
                         }
                     }
                 }
             }
         }
     ]
     try_job_120.put()
 
     handlers_util._GetCulpritInfoForTryJobResult(try_job_key, culprits_info)
 
     expected_culprits_info = {
-        'a_test-a_test3': {
-            'step': 'a_test',
-            'test': 'a_test3',
+        'a_test on platform-a_test3': {
+            'step_name': 'a_test on platform',
+            'test_name': 'a_test3',
             'try_job_key': 'm/b/120',
             'try_job_build_number': 120,
             'status': 'Completed',
             'try_job_url': (
                 'http://build.chromium.org/p/tryserver.chromium.linux/'
                 'builders/linux_chromium_variable/builds/120'),
             'revision': 'rev0',
             'commit_position': '0',
             'review_url': 'url_0'
         }
     }
 
     self.assertEqual(expected_culprits_info, culprits_info)