Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/test/peoplelist_test.py b/project/test/peoplelist_test.py
index 6620df9..5459763 100644
--- a/project/test/peoplelist_test.py
+++ b/project/test/peoplelist_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.
"""Unittest for People List servlet."""
from __future__ import print_function
@@ -13,7 +12,7 @@
from framework import authdata
from framework import permissions
from project import peoplelist
-from proto import user_pb2
+from mrproto import user_pb2
from services import service_manager
from testing import fake
from testing import testing_helpers
@@ -35,7 +34,7 @@
self.project.owner_ids.extend([111])
self.project.committer_ids.extend([222])
self.project.contributor_ids.extend([333])
- self.servlet = peoplelist.PeopleList('req', 'res', services=services)
+ self.servlet = peoplelist.PeopleList(services=services)
def VerifyAccess(self, exception_expected):
mr = testing_helpers.MakeMonorailRequest(