Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/test/table_view_helpers_test.py b/framework/test/table_view_helpers_test.py
index 0260308..f0c6643 100644
--- a/framework/test/table_view_helpers_test.py
+++ b/framework/test/table_view_helpers_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 table_view_helpers classes and functions."""
from __future__ import print_function
@@ -9,12 +8,12 @@
from __future__ import absolute_import
import collections
+import six
import unittest
-import logging
from framework import framework_views
from framework import table_view_helpers
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from testing import fake
from testing import testing_helpers
from tracker import tracker_bizobj
@@ -147,8 +146,9 @@
users_by_id=self.users_by_id)
self.assertEqual(cell.type, table_view_helpers.CELL_TYPE_ATTR)
self.assertEqual(len(cell.values), 2)
- self.assertItemsEqual([cell.values[0].item, cell.values[1].item],
- ['foo@example.com', 'f...@example.com'])
+ six.assertCountEqual(
+ self, [cell.values[0].item, cell.values[1].item],
+ ['foo@example.com', 'f...@example.com'])
# TODO(jrobbins): TableCellProject, TableCellStars