[Findit] Fix bug when display try job result for non-swarming step.

appengine/findit/handlers/test/swarming_task_test.py

Index: appengine/findit/handlers/test/swarming_task_test.py
diff --git a/appengine/findit/handlers/test/swarming_task_test.py b/appengine/findit/handlers/test/swarming_task_test.py
index 855c37a6ece495093eab76f3be32a43c8bc0ce73..e07f93813a62c2367115af41918a4ec07c00be74 100644
--- a/appengine/findit/handlers/test/swarming_task_test.py
+++ b/appengine/findit/handlers/test/swarming_task_test.py
@@ -7,11 +7,7 @@ import webapp2
 from testing_utils import testing
 
 from handlers import swarming_task
-from model import wf_analysis_status
-from model.wf_analysis import WfAnalysis
-from model.wf_swarming_task import WfSwarmingTask
 from waterfall import buildbot
-from waterfall import waterfall_config
 
 class SwarmingTaskTest(testing.AppengineTestCase):
   app_module = webapp2.WSGIApplication([
@@ -23,146 +19,6 @@ class SwarmingTaskTest(testing.AppengineTestCase):
     self.builder_name = 'b'
     self.build_number = 121
 
-    def MockedGetSwarmingSettings():
-      return {'server_host': 'chromium-swarm.appspot.com'}
-    self.mock(
-        waterfall_config, 'GetSwarmingSettings', MockedGetSwarmingSettings)
-
-  def testGenerateSwarmingTasksDataReturnEmptyIfNoFailureMap(self):
-    WfAnalysis.Create(
-        self.master_name, self.builder_name, self.build_number).put()
-
-    data = swarming_task._GenerateSwarmingTasksData(
-        self.master_name, self.builder_name, self.build_number)
-
-    self.assertEqual({}, data)
-
-  def testGenerateSwarmingTasksDataReturnEmptyIfNoSwarmingTests(self):
-    analysis = WfAnalysis.Create(
-        self.master_name, self.builder_name, self.build_number)
-    analysis.failure_result_map = {
-        'step1': '%s/%s/%s' % (self.master_name, self.builder_name, 120),
-        'step2': '%s/%s/%s' % (
-            self.master_name, self.builder_name, self.build_number)
-    }
-    analysis.put()
-
-    data = swarming_task._GenerateSwarmingTasksData(
-        self.master_name, self.builder_name, self.build_number)
-
-    self.assertEqual({}, data)
-
-  def testGenerateSwarmingTasksDataIfNoSwarmingTask(self):
-    analysis = WfAnalysis.Create(
-        self.master_name, self.builder_name, self.build_number)
-    analysis.failure_result_map = {
-        'step1': {
-            'test1': '%s/%s/%s' % (self.master_name, self.builder_name, 120),
-            'test2': '%s/%s/%s' % (
-                self.master_name, self.builder_name, self.build_number)
-        },
-        'step2': {
-            'test1': '%s/%s/%s' % (self.master_name, self.builder_name, 120)
-        }
-    }
-    analysis.put()
-
-    data = swarming_task._GenerateSwarmingTasksData(
-        self.master_name, self.builder_name, self.build_number)
-
-    expected_data = {
-        'step1': {
-            'swarming_tasks': [],
-            'tests': {}
-        },
-        'step2': {
-            'swarming_tasks': [],
-            'tests': {}
-        }
-    }
-    self.assertEqual(expected_data, data)
-
-  def testGenerateSwarmingTasksData(self):
-    analysis = WfAnalysis.Create(
-        self.master_name, self.builder_name, self.build_number)
-    analysis.failure_result_map = {
-        'step1': {
-            'test1': '%s/%s/%s' % (self.master_name, self.builder_name, 120),
-            'test2': '%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')
-    task0.task_id = 'task0'
-    task0.status = wf_analysis_status.ANALYZED
-    task0.put()
-
-    task1 = WfSwarmingTask.Create(
-        self.master_name, self.builder_name, self.build_number, 'step1')
-    task1.task_id = 'task1'
-    task1.status = wf_analysis_status.ANALYZED
-    task1.put()
-
-    task2 = WfSwarmingTask.Create(
-        self.master_name, self.builder_name, self.build_number, 'step2')
-    task2.put()
-
-    data = swarming_task._GenerateSwarmingTasksData(
-        self.master_name, self.builder_name, self.build_number)
-
-    expected_data = {
-        'step1': {
-            'swarming_tasks': [
-                {
-                    'status': 'Completed',
-                    'task_id': 'task1',
-                    'task_url': (
-                        'https://chromium-swarm.appspot.com/user/task/task1')
-                },
-                {
-                    'status': 'Completed',
-                    'task_id': 'task0',
-                    'task_url': (
-                        'https://chromium-swarm.appspot.com/user/task/task0')
-                }
-            ],
-            'tests': {
-                'test1': {
-                    'status': 'Completed',
-                    'task_id': 'task0',
-                    'task_url': (
-                        'https://chromium-swarm.appspot.com/user/task/task0')
-                },
-                'test2': {
-                    'status': 'Completed',
-                    'task_id': 'task1',
-                    'task_url': (
-                        'https://chromium-swarm.appspot.com/user/task/task1')
-                }
-            }
-        },
-        'step2': {
-            'swarming_tasks': [
-                {
-                    'status': 'Pending'
-                }
-            ],
-            'tests': {
-                'test1': {
-                    'status': 'Pending'
-                }
-            }
-        }
-    }
-    self.assertEqual(expected_data, data)
-
   def testSwarmingTaskHandler(self):
     build_url = buildbot.CreateBuildUrl(
         self.master_name, self.builder_name, self.build_number)