[Findit] don't included skipped or unknown tests in swarming tasks into failed tests.

appengine/findit/handlers/handlers_util.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 collections import defaultdict
 import copy
 
 from handlers import result_status
 from model import analysis_status
 from model.wf_analysis import WfAnalysis
@@ skipping 68 matching lines @@
   for step_name, failure in failure_result_map.iteritems():
     step_tasks_info = tasks_info[step_name]['swarming_tasks']
     if isinstance(failure, dict):
       # Only swarming test failures have swarming re-runs.
       swarming_task_keys = set(failure.values())
 
       for key in swarming_task_keys:
         task_dict = step_tasks_info[key]
         referred_build_keys = key.split('/')
         task = WfSwarmingTask.Get(*referred_build_keys, step_name=step_name)
+        all_tests = _GetAllTestsForASwarmingTask(key, failure)
+        task_dict['all_tests'] = all_tests
         if not task:  # In case task got manually removed from data store.
           task_info = {
               'status': result_status.NO_SWARMING_TASK_FOUND
           }
-          task_dict['all_tests'] = _GetAllTestsForASwarmingTask(key, failure)
         else:
           task_info = {
               'status': task.status
           }
 
-          task_dict['all_tests'] = (
-              _GetAllTestsForASwarmingTask(key, failure)
-              if not (task.parameters and task.parameters.get('tests'))
-              else task.parameters['tests'])
-
           # Get the step name without platform.
           # This value should have been saved in task.parameters;
           # in case of no such value saved, split the step_name.
           task_dict['ref_name'] = (
               step_name.split()[0]
               if not task.parameters or not task.parameters.get('ref_name')
               else task.parameters['ref_name'])
 
           if task.task_id:  # Swarming rerun has started.
             task_info['task_id'] = task.task_id
             task_info['task_url'] = 'https://%s/user/task/%s' % (
                 swarming_server, task.task_id)
           if task.classified_tests:
             # Swarming rerun has completed.
             # Use its result to get reliable and flaky tests.
             # If task has not completed, there will be no try job yet,
             # the result will be grouped in unclassified failures temporarily.
-            task_dict['reliable_tests'] = task.classified_tests.get(
-                'reliable_tests', [])
-            task_dict['flaky_tests'] = task.classified_tests.get(
-                'flaky_tests', [])
+            reliable_tests = task.classified_tests.get('reliable_tests', [])
+            task_dict['reliable_tests'] = [
+                test for test in reliable_tests if test in all_tests]
+            flaky_tests = task.classified_tests.get('flaky_tests', [])
+            task_dict['flaky_tests'] = [
+                test for test in flaky_tests if test in all_tests]
 
         task_dict['task_info'] = task_info
     else:
       step_tasks_info[failure] = {
           'task_info': {
               'status': result_status.NON_SWARMING_NO_RERUN
           }
       }
 
   return tasks_info
@@ skipping 287 matching lines @@
 
       culprits_info[step_name] = {
           'try_jobs': [
               {
                   'status': result_status.NO_FAILURE_RESULT_MAP,
                   'tests': tests
               }
           ]
       }
   return culprits_info