Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/project/test/projectexport_test.py b/project/test/projectexport_test.py
index 6dbe990..d575f2a 100644
--- a/project/test/projectexport_test.py
+++ b/project/test/projectexport_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 the projectexport servlet."""
from __future__ import print_function
@@ -14,7 +13,7 @@
from framework import permissions
from project import projectexport
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from services import service_manager
from services.template_svc import TemplateService
from testing import fake
@@ -25,8 +24,7 @@
def setUp(self):
self.services = service_manager.Services()
- self.servlet = projectexport.ProjectExport(
- 'req', 'res', services=self.services)
+ self.servlet = projectexport.ProjectExport(services=self.services)
def testAssertBasePermission(self):
mr = testing_helpers.MakeMonorailRequest(
@@ -46,8 +44,7 @@
user=fake.UserService(),
template=Mock(spec=TemplateService))
self.services.user.TestAddUser('user1@example.com', 111)
- self.servlet = projectexport.ProjectExportJSON(
- 'req', 'res', services=self.services)
+ self.servlet = projectexport.ProjectExportJSON(services=self.services)
self.project = fake.Project(project_id=789)
self.mr = testing_helpers.MakeMonorailRequest(
perms=permissions.OWNER_ACTIVE_PERMISSIONSET)