Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/test/issuedetailezt_test.py b/tracker/test/issuedetailezt_test.py
index fe3d22f..fe51ddf 100644
--- a/tracker/test/issuedetailezt_test.py
+++ b/tracker/test/issuedetailezt_test.py
@@ -1,7 +1,6 @@
-# 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 or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Unittests for monorail.tracker.issuedetailezt."""
from __future__ import print_function
@@ -19,7 +18,7 @@
import settings
from businesslogic import work_env
-from proto import features_pb2
+from mrproto import features_pb2
from features import hotlist_views
from features import send_notifications
from framework import authdata
@@ -31,9 +30,9 @@
from framework import profiler
from framework import sorting
from framework import template_helpers
-from proto import project_pb2
-from proto import tracker_pb2
-from proto import user_pb2
+from mrproto import project_pb2
+from mrproto import tracker_pb2
+from mrproto import user_pb2
from services import service_manager
from services import issue_svc
from services import tracker_fulltext
@@ -144,12 +143,9 @@
project=fake.ProjectService())
self.project = self.services.project.TestAddProject(
'proj', project_id=987, committer_ids=[111])
- self.next_servlet = issuedetailezt.FlipperNext(
- 'req', 'res', services=self.services)
- self.prev_servlet = issuedetailezt.FlipperPrev(
- 'req', 'res', services=self.services)
- self.list_servlet = issuedetailezt.FlipperList(
- 'req', 'res', services=self.services)
+ self.next_servlet = issuedetailezt.FlipperNext(services=self.services)
+ self.prev_servlet = issuedetailezt.FlipperPrev(services=self.services)
+ self.list_servlet = issuedetailezt.FlipperList(services=self.services)
mr = testing_helpers.MakeMonorailRequest(project=self.project)
mr.local_id = 123
mr.me_user_id = 111
@@ -177,7 +173,7 @@
patchGetAdjacentIssue.return_value = self.fake_issue_2
self.next_servlet.mr.GetIntParam = mock.Mock(return_value=None)
- self.next_servlet.get(project_name='proj', viewed_username=None)
+ self.next_servlet.get()
self.next_servlet.mr.GetIntParam.assert_called_once_with('hotlist_id')
patchGetAdjacentIssue.assert_called_once()
self.next_servlet.redirect.assert_called_once_with(
@@ -189,7 +185,7 @@
self.next_servlet.mr.GetIntParam = mock.Mock(return_value=123)
# TODO(jeffcarp): Mock hotlist_id param on path here.
- self.next_servlet.get(project_name='proj', viewed_username=None)
+ self.next_servlet.get()
self.next_servlet.mr.GetIntParam.assert_called_with('hotlist_id')
self.next_servlet.redirect.assert_called_once_with(
'/p/potato/issues/detail?id=789')
@@ -199,7 +195,7 @@
patchGetAdjacentIssue.return_value = self.fake_issue_2
self.next_servlet.mr.GetIntParam = mock.Mock(return_value=None)
- self.prev_servlet.get(project_name='proj', viewed_username=None)
+ self.prev_servlet.get()
self.prev_servlet.mr.GetIntParam.assert_called_with('hotlist_id')
patchGetAdjacentIssue.assert_called_once()
self.prev_servlet.redirect.assert_called_once_with(
@@ -211,7 +207,7 @@
self.prev_servlet.mr.GetIntParam = mock.Mock(return_value=123)
# TODO(jeffcarp): Mock hotlist_id param on path here.
- self.prev_servlet.get(project_name='proj', viewed_username=None)
+ self.prev_servlet.get()
self.prev_servlet.mr.GetIntParam.assert_called_with('hotlist_id')
self.prev_servlet.redirect.assert_called_once_with(
'/p/potato/issues/detail?id=789')