Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/tracker/test/issueexport_test.py b/tracker/test/issueexport_test.py
index 4e70ab7..7d51c84 100644
--- a/tracker/test/issueexport_test.py
+++ b/tracker/test/issueexport_test.py
@@ -1,19 +1,19 @@
-# 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 issueexport servlet."""
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
+import six
import unittest
from mock import Mock, patch
from framework import permissions
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from services import service_manager
from testing import testing_helpers
from testing import fake
@@ -32,10 +32,8 @@
)
self.cnxn = 'fake connection'
self.project = self.services.project.TestAddProject('proj', project_id=789)
- self.servlet = issueexport.IssueExport(
- 'req', 'res', services=self.services)
- self.jsonfeed = issueexport.IssueExportJSON(
- 'req', 'res', services=self.services)
+ self.servlet = issueexport.IssueExport(services=self.services)
+ self.jsonfeed = issueexport.IssueExportJSON(services=self.services)
self.mr = testing_helpers.MakeMonorailRequest(
project=self.project, perms=permissions.OWNER_ACTIVE_PERMISSIONSET)
self.mr.can = 1
@@ -62,8 +60,8 @@
{'version': 1, 'who': None, 'when': 1234,
'project': 'proj', 'start': 0, 'num': 100})
self.assertEqual(json_data['issues'], [])
- self.assertItemsEqual(
- json_data['emails'], ['user1@test.com', 'user2@test.com'])
+ six.assertCountEqual(
+ self, json_data['emails'], ['user1@test.com', 'user2@test.com'])
# TODO(jojwang): test attachments, amendments, comment details
def testMakeIssueJSON(self):