Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/services/test/caches_test.py b/services/test/caches_test.py
index cd401be..23f793c 100644
--- a/services/test/caches_test.py
+++ b/services/test/caches_test.py
@@ -1,13 +1,13 @@
-# 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 the cache classes."""
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
+import six
import unittest
from google.appengine.api import memcache
@@ -141,10 +141,10 @@
self.assertEqual(3, len(self.sharded_ram_cache.cache))
-class TestableTwoLevelCache(caches.AbstractTwoLevelCache):
+class _TestableTwoLevelCache(caches.AbstractTwoLevelCache):
def __init__(self, cache_manager, kind, max_size=None):
- super(TestableTwoLevelCache, self).__init__(
+ super(_TestableTwoLevelCache, self).__init__(
cache_manager, kind, 'testable:', None, max_size=max_size)
# pylint: disable=unused-argument
@@ -162,7 +162,7 @@
self.cnxn = 'fake connection'
self.cache_manager = fake.CacheManager()
- self.testable_2lc = TestableTwoLevelCache(self.cache_manager, 'issue')
+ self.testable_2lc = _TestableTwoLevelCache(self.cache_manager, 'issue')
def tearDown(self):
self.testbed.deactivate()
@@ -239,8 +239,9 @@
self.assertEqual({123: 12300, 124: 12400, 333: 333, 444: 444}, hits)
self.assertEqual([], misses)
# The RAM cache now has items found in memcache and DB.
- self.assertItemsEqual(
- [123, 124, 125, 333, 444], list(self.testable_2lc.cache.cache.keys()))
+ six.assertCountEqual(
+ self, [123, 124, 125, 333, 444],
+ list(self.testable_2lc.cache.cache.keys()))
def testGetAll_FetchGetsItFromDB(self):
self.testable_2lc.CacheItem(123, 12300)