Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/test/emailfmt_test.py b/framework/test/emailfmt_test.py
index dd7cca3..5445189 100644
--- a/framework/test/emailfmt_test.py
+++ b/framework/test/emailfmt_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.
"""Tests for monorail.framework.emailfmt."""
from __future__ import print_function
@@ -9,6 +8,7 @@
from __future__ import absolute_import
import mock
+import six
import unittest
from google.appengine.ext import testbed
@@ -16,7 +16,7 @@
import settings
from framework import emailfmt
from framework import framework_views
-from proto import project_pb2
+from mrproto import project_pb2
from testing import testing_helpers
from google.appengine.api import apiproxy_stub_map
@@ -79,12 +79,11 @@
testing_helpers.HEADER_LINES + [references_header], 'awesome!')
(from_addr, to_addrs, cc_addrs, references, incident_id, subject,
body) = emailfmt.ParseEmailMessage(msg)
- self.assertItemsEqual(
- ['<5678@bar.com>',
- '<0=969704940193871313=13442892928193434663='
- 'proj@monorail.example.com>',
- '<1234@foo.com>'],
- references)
+ six.assertCountEqual(
+ self, [
+ '<5678@bar.com>', '<0=969704940193871313=13442892928193434663='
+ 'proj@monorail.example.com>', '<1234@foo.com>'
+ ], references)
def testParseEmailMessage_Bulk(self):
for precedence in ['Bulk', 'Junk']: