[polymer] Merge of master into polymer10-migration

dashboard/dashboard/auto_triage_test.py

Index: dashboard/dashboard/auto_triage_test.py
diff --git a/dashboard/dashboard/auto_triage_test.py b/dashboard/dashboard/auto_triage_test.py
index f1d1fc23ab89dc0db2209415c53c63744a59f35a..82f90ad448c26b66168a7ad3c63023203d4708f7 100644
--- a/dashboard/dashboard/auto_triage_test.py
+++ b/dashboard/dashboard/auto_triage_test.py
@@ -11,6 +11,7 @@ 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
@@ -18,6 +19,8 @@ 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):
 
@@ -135,9 +138,7 @@ class AutoTriageTest(testing_common.TestCase):
     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 = [