Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/test/componentdetail_test.py b/tracker/test/componentdetail_test.py
index 6186582..0dcff92 100644
--- a/tracker/test/componentdetail_test.py
+++ b/tracker/test/componentdetail_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 the componentdetail servlet."""
from __future__ import print_function
@@ -10,7 +9,7 @@
import unittest
-from mock import Mock, patch
+from mock import Mock
try:
from mox3 import mox
@@ -19,7 +18,7 @@
from features import filterrules_helpers
from framework import permissions
-from proto import project_pb2
+from mrproto import project_pb2
from services import service_manager
from services import template_svc
from testing import fake
@@ -27,8 +26,6 @@
from tracker import componentdetail
from tracker import tracker_bizobj
-import webapp2
-
class ComponentDetailTest(unittest.TestCase):
@@ -39,8 +36,7 @@
config=fake.ConfigService(),
template=Mock(spec=template_svc.TemplateService),
project=fake.ProjectService())
- self.servlet = componentdetail.ComponentDetail(
- 'req', 'res', services=self.services)
+ self.servlet = componentdetail.ComponentDetail(services=self.services)
self.project = self.services.project.TestAddProject('proj')
self.mr = testing_helpers.MakeMonorailRequest(
project=self.project, perms=permissions.OWNER_ACTIVE_PERMISSIONSET)
@@ -65,9 +61,7 @@
def testGetComponentDef_NotFound(self):
self.mr.component_path = 'NeverHeardOfIt'
- self.assertRaises(
- webapp2.HTTPException,
- self.servlet._GetComponentDef, self.mr)
+ self.assertRaises(Exception, self.servlet._GetComponentDef, self.mr)
def testGetComponentDef_Normal(self):
actual_config, actual_cd = self.servlet._GetComponentDef(self.mr)
@@ -215,7 +209,7 @@
self.servlet.ProcessFormData(self.mr, post_data)
self.assertEqual(
'User tried to delete component that had subcomponents',
- cm.exception.message)
+ str(cm.exception))
def testProcessFormData_Edit(self):
post_data = fake.PostData(