[polymer] Merge of master into polymer10-migration

dashboard/dashboard/auto_triage_test.py

 # Copyright 2015 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.
 
 import unittest
 
 import mock
 import webapp2
 import webtest
 
 from google.appengine.ext import ndb
 
 from dashboard import auto_triage
+from dashboard import issue_tracker_service
 from dashboard import testing_common
 from dashboard import utils
 from dashboard.models import anomaly
 from dashboard.models import bug_data
 from dashboard.models import sheriff
 
 
+@mock.patch('apiclient.discovery.build', mock.MagicMock())
+@mock.patch.object(utils, 'ServiceAccountCredentials', mock.MagicMock())
 @mock.patch.object(utils, 'TickMonitoringCustomMetric', mock.MagicMock())
 class AutoTriageTest(testing_common.TestCase):
 
   def setUp(self):
     super(AutoTriageTest, self).setUp()
     app = webapp2.WSGIApplication(
         [('/auto_triage', auto_triage.AutoTriageHandler)])
     self.testapp = webtest.TestApp(app)
 
   def _AddTestData(self, series, sheriff_key,
@@ skipping 97 matching lines @@
         49, 50, 51, 50, 51, 49, 51, 50, 50, 49,
     ]
     test_key = self._AddTestData(values, sheriff_key)
     anomaly_key = self._AddAnomalyForTest(
         sheriff_key, test_key, revision=11, median_before=50, median_after=55,
         bug_id=-1)
     self.testapp.post('/auto_triage')
     self.assertFalse(anomaly_key.get().recovered)
 
   @mock.patch.object(
-      utils, 'ServiceAccountCredentials', mock.MagicMock())
-  @mock.patch.object(
-      auto_triage.issue_tracker_service.IssueTrackerService, 'AddBugComment')
+      issue_tracker_service.IssueTrackerService, 'AddBugComment')
   def testPost_AllAnomaliesRecovered_AddsComment(self, add_bug_comment_mock):
     sheriff_key = sheriff.Sheriff(email='a@google.com', id='sheriff_key').put()
     values = [
         49, 50, 51, 50, 51, 49, 51, 50, 50, 49,
         55, 54, 55, 56, 54, 56, 57, 56, 55, 56,
         49, 50, 51, 50, 51, 49, 51, 50, 50, 49,
     ]
     test_key = self._AddTestData(values, sheriff_key)
     anomaly_key = self._AddAnomalyForTest(
         sheriff_key, test_key, revision=11, median_before=50, median_after=55,
@@ skipping 61 matching lines @@
         series, sheriff_key, improvement_direction=anomaly.DOWN)
     anomaly_key = self._AddAnomalyForTest(
         sheriff_key, test_key, revision=362399,
         median_before=78275468.8, median_after=79630313.6)
     self.testapp.post('/auto_triage')
     self.assertTrue(anomaly_key.get().recovered)
 
 
 if __name__ == '__main__':
   unittest.main()