Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/test/templatecreate_test.py b/tracker/test/templatecreate_test.py
index 78664c0..442bf8b 100644
--- a/tracker/test/templatecreate_test.py
+++ b/tracker/test/templatecreate_test.py
@@ -1,7 +1,6 @@
-# Copyright 2018 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 or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2018 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Unit test for Template creation servlet."""
from __future__ import print_function
@@ -27,7 +26,7 @@
from tracker import templatecreate
from tracker import tracker_bizobj
from tracker import tracker_views
-from proto import tracker_pb2
+from mrproto import tracker_pb2
class TemplateCreateTest(unittest.TestCase):
@@ -40,8 +39,7 @@
config=fake.ConfigService(),
template=Mock(spec=template_svc.TemplateService),
user=fake.UserService())
- self.servlet = templatecreate.TemplateCreate('req', 'res',
- services=self.services)
+ self.servlet = templatecreate.TemplateCreate(services=self.services)
self.project = self.services.project.TestAddProject('proj')
self.fd_1 = tracker_bizobj.MakeFieldDef(
@@ -372,6 +370,16 @@
tracker_pb2.ApprovalStatus.NEEDS_REVIEW), phase_id=1)
]
self.services.template.CreateIssueTemplateDef.assert_called_once_with(
- self.mr.cnxn, 47925, 'secondtemplate', 'HEY WHY', 'TLDR', True,
- 'Accepted', True, False, True, 0, ['label-One', 'label-Two'], [], [],
- [fv], phases=phases, approval_values=approval_values)
+ self.mr.cnxn,
+ self.mr.project_id,
+ 'secondtemplate',
+ 'HEY WHY',
+ 'TLDR',
+ True,
+ 'Accepted',
+ True,
+ False,
+ True,
+ 0, ['label-One', 'label-Two'], [], [], [fv],
+ phases=phases,
+ approval_values=approval_values)