Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/test/framework_helpers_test.py b/framework/test/framework_helpers_test.py
index fb8810b..fe0a225 100644
--- a/framework/test/framework_helpers_test.py
+++ b/framework/test/framework_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 the framework_helpers module."""
from __future__ import print_function
@@ -15,14 +14,15 @@
from mox3 import mox
except ImportError:
import mox
+import six
import time
from businesslogic import work_env
from framework import framework_helpers
from framework import framework_views
-from proto import features_pb2
-from proto import project_pb2
-from proto import user_pb2
+from mrproto import features_pb2
+from mrproto import project_pb2
+from mrproto import user_pb2
from services import service_manager
from testing import fake
from testing import testing_helpers
@@ -381,8 +381,8 @@
"""Run one call to the target method and check expected results."""
actual_added, actual_removed = framework_helpers.ComputeListDeltas(
old, new)
- self.assertItemsEqual(added, actual_added)
- self.assertItemsEqual(removed, actual_removed)
+ six.assertCountEqual(self, added, actual_added)
+ six.assertCountEqual(self, removed, actual_removed)
def testEmptyLists(self):
self.DoOne(old=[], new=[], added=[], removed=[])
@@ -430,7 +430,7 @@
'preview_on_hover',
'settings_user_prefs',
]
- self.assertItemsEqual(expected_keys, list(page_data.keys()))
+ six.assertCountEqual(self, expected_keys, list(page_data.keys()))
self.assertEqual('profile/url', page_data['profile_url_fragment'])
self.assertTrue(page_data['settings_user_prefs'].public_issue_notice)