Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/test/projectadmin_test.py b/project/test/projectadmin_test.py
index 0257cd0..0b2dc82 100644
--- a/project/test/projectadmin_test.py
+++ b/project/test/projectadmin_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.
"""Unit tests for projectadmin module."""
from __future__ import print_function
@@ -12,7 +11,7 @@
from framework import permissions
from project import projectadmin
-from proto import project_pb2
+from mrproto import project_pb2
from services import service_manager
from testing import fake
from testing import testing_helpers
@@ -25,7 +24,7 @@
services = service_manager.Services(
project=fake.ProjectService(),
user=fake.UserService())
- self.servlet = projectadmin.ProjectAdmin('req', 'res', services=services)
+ self.servlet = projectadmin.ProjectAdmin(services=services)
self.project = services.project.TestAddProject(
'proj', summary='a summary', description='a description')
self.request, self.mr = testing_helpers.GetRequestObjects(