[Findit] don't included skipped or unknown tests in swarming tasks into failed 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 handlers import handlers_util
 from handlers import result_status
 from model import analysis_status
 from model.wf_analysis import WfAnalysis
 from model.wf_swarming_task import WfSwarmingTask
 from model.wf_try_job import WfTryJob
@@ skipping 116 matching lines @@
             }
         }
     }
     self.assertEqual(expected_data, data)
 
   def testGetSwarmingTaskInfo(self):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, self.build_number)
     analysis.failure_result_map = {
         'step1 on platform': {
-            'test1': '%s/%s/%s' % (self.master_name, self.builder_name, 120),
-            'test2': '%s/%s/%s' % (
+            'PRE_test1': '%s/%s/%s' % (
+                self.master_name, self.builder_name, 120),
+            'PRE_PRE_test2': '%s/%s/%s' % (
                 self.master_name, self.builder_name, self.build_number),
             'test3': '%s/%s/%s' % (
                 self.master_name, self.builder_name, self.build_number),
             'test4': '%s/%s/%s' % (
                 self.master_name, self.builder_name, self.build_number)
         },
         'step2': {
             'test1': '%s/%s/%s' % (
                 self.master_name, self.builder_name, self.build_number)
         }
     }
     analysis.put()
 
     task0 = WfSwarmingTask.Create(
         self.master_name, self.builder_name, 120, 'step1 on platform')
     task0.task_id = 'task0'
     task0.status = analysis_status.COMPLETED
     task0.parameters = {
         'tests': ['test1']
     }
     task0.tests_statuses = {
         'test1': {
             'total_run': 2,
+            'SKIPPED': 2
+        },
+        'PRE_test1': {
+            'total_run': 2,
             'FAILURE': 2
         }
     }
     task0.put()
 
     task1 = WfSwarmingTask.Create(
         self.master_name, self.builder_name, self.build_number,
         'step1 on platform')
     task1.task_id = 'task1'
     task1.status = analysis_status.COMPLETED
     task1.parameters = {
         'tests': ['test2', 'test3', 'test4']
     }
     task1.tests_statuses = {
+        'PRE_PRE_test2': {
+            'total_run': 2,
+            'FAILURE': 2
+        },
+        'PRE_test2': {
+            'total_run': 2,
+            'SKIPPED': 2
+        },
         'test2': {
             'total_run': 2,
-            'FAILURE': 2
+            'SKIPPED': 2
         },
         'test3': {
             'total_run': 4,
             'SUCCESS': 2,
             'FAILURE': 2
         },
         'test4': {
             'total_run': 6,
             'SUCCESS': 6
         }
@@ skipping 10 matching lines @@
     expected_data = {
         'step1 on platform': {
             'swarming_tasks': {
                 'm/b/121': {
                     'task_info': {
                         'status': analysis_status.COMPLETED,
                         'task_id': 'task1',
                         'task_url': ('https://chromium-swarm.appspot.com/user'
                                      '/task/task1')
                     },
-                    'all_tests': ['test2', 'test3', 'test4'],
-                    'reliable_tests': ['test2'],
+                    'all_tests': ['PRE_PRE_test2', 'test3', 'test4'],
+                    'reliable_tests': ['PRE_PRE_test2'],
                     'flaky_tests': ['test3', 'test4'],
                     'ref_name': 'step1'
                 },
                 'm/b/120': {
                     'task_info': {
                         'status': analysis_status.COMPLETED,
                         'task_id': 'task0',
                         'task_url': ('https://chromium-swarm.appspot.com/user/'
                                      'task/task0')
                     },
-                    'all_tests': ['test1'],
-                    'reliable_tests': ['test1'],
+                    'all_tests': ['PRE_test1'],
+                    'reliable_tests': ['PRE_test1'],
                     'flaky_tests': [],
                     'ref_name': 'step1'
                 }
             }
         },
         'step2': {
             'swarming_tasks': {
                 'm/b/121': {
                     'task_info': {
                         'status': analysis_status.PENDING
                     },
-                    'all_tests': ['test1'],
+                    'all_tests': ['PRE_test1'],
                     'ref_name': 'step2'
                 }
             }
         }
     }
-    self.assertEqual(expected_data, data)
+    self.assertEqual(sorted(expected_data), sorted(data))
 
   def testGetAllTryJobResultsNoAnalysis(self):
     data = handlers_util.GetAllTryJobResults(
         self.master_name, self.builder_name, self.build_number)
 
     self.assertEqual({}, data)
 
   def testGetTryJobResultReturnNoneIfNoFailureResultMap(self):
     analysis = WfAnalysis.Create(
         self.master_name, self.builder_name, self.build_number)
@@ skipping 711 matching lines @@
                     'status': analysis_status.RUNNING,
                     'try_job_url': (
                         'http://build.chromium.org/p/tryserver.chromium.'
                         'linux/builders/linux_chromium_variable/builds/121'),
                     'try_job_build_number': 121
                 }
             ]
         }
     }
     self.assertEqual(expected_culprits_info, culprits_info)