Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/api/v3/test/frontend_servicer_test.py b/api/v3/test/frontend_servicer_test.py
index e58f1ab..5fc9729 100644
--- a/api/v3/test/frontend_servicer_test.py
+++ b/api/v3/test/frontend_servicer_test.py
@@ -1,7 +1,6 @@
-# Copyright 2020 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 2020 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Tests for the hotlists servicer."""
from __future__ import print_function
from __future__ import division
@@ -19,7 +18,7 @@
from api.v3.api_proto import project_objects_pb2
from framework import exceptions
from framework import monorailcontext
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from services import service_manager
from testing import fake
from tracker import tracker_constants
@@ -209,9 +208,8 @@
'owner_proj', project_id=777, owner_ids=[111])
self.services.project.TestAddProject(
'committer_proj', project_id=888, committer_ids=[111])
- contributor_proj = self.services.project.TestAddProject(
- 'contributor_proj', project_id=999)
- contributor_proj.contributor_ids = [111]
+ self.services.project.TestAddProject(
+ 'contributor_proj', project_id=999, contrib_ids=[111])
request = frontend_pb2.GatherProjectMembershipsForUserRequest(
user=self.user_1_resource_name)