Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/test/fieldcreate_test.py b/tracker/test/fieldcreate_test.py
index 4a8c919..c1b9729 100644
--- a/tracker/test/fieldcreate_test.py
+++ b/tracker/test/fieldcreate_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 fieldcreate servlet."""
from __future__ import print_function
@@ -13,13 +12,14 @@
except ImportError:
import mox
import mock
+import six
import unittest
import logging
import ezt
from framework import permissions
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from services import service_manager
from testing import fake
from testing import testing_helpers
@@ -35,8 +35,7 @@
user=fake.UserService(),
config=fake.ConfigService(),
project=fake.ProjectService())
- self.servlet = fieldcreate.FieldCreate(
- 'req', 'res', services=self.services)
+ self.servlet = fieldcreate.FieldCreate(services=self.services)
self.project = self.services.project.TestAddProject('proj')
self.mr = testing_helpers.MakeMonorailRequest(
project=self.project, perms=permissions.OWNER_ACTIVE_PERMISSIONSET)
@@ -84,8 +83,8 @@
page_data = self.servlet.GatherPageData(self.mr)
self.assertEqual(self.servlet.PROCESS_TAB_LABELS,
page_data['admin_tab_mode'])
- self.assertItemsEqual(
- ['Defect', 'Enhancement', 'Task', 'Other'],
+ six.assertCountEqual(
+ self, ['Defect', 'Enhancement', 'Task', 'Other'],
page_data['well_known_issue_types'])
self.assertEqual(['LaunchApproval'], page_data['approval_names'])
self.assertEqual('', page_data['initial_admins'])