openstack/swift
Code Issues Proposed changes

py3: Make StoragePolicy objects hashable

Browse Source 
Change-Id: I2e233afff26878ba94e268c71f6779bcca7b641c
This commit is contained in:
Tim Burke
2019-05-04 21:01:29 -07:00
parent b8284538be
commit fed0204e86
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
swift/common/storage_policy.py
View File

@@ -206,6 +206,9 @@ class BaseStoragePolicy(object):
def __int__(self): def __int__(self):
return self.idx return self.idx
def __hash__(self):
return hash(self.idx)
def __eq__(self, other): def __eq__(self, other):
return self.idx == int(other) return self.idx == int(other)

14
test/unit/common/test_storage_policy.py
View File

@@ -1085,6 +1085,20 @@ class TestStoragePolicies(unittest.TestCase):
p503 = test_policies[503] p503 = test_policies[503]
self.assertTrue(501 < p503 < 507) self.assertTrue(501 < p503 < 507)
def test_storage_policies_as_dict_keys(self):
# We have tests that expect to be able to map policies
# to expected values in a dict; check that we can use
# policies as keys.
test_policies = [StoragePolicy(0, 'aay', True),
StoragePolicy(1, 'bee', False),
StoragePolicy(2, 'cee', False)]
policy_to_name_map = {p: p.name for p in test_policies}
self.assertEqual(sorted(policy_to_name_map.keys()), test_policies)
self.assertIs(test_policies[0], next(
p for p in policy_to_name_map.keys() if p.is_default))
for p in test_policies:
self.assertEqual(policy_to_name_map[p], p.name)
def test_get_object_ring(self): def test_get_object_ring(self):
test_policies = [StoragePolicy(0, 'aay', True), test_policies = [StoragePolicy(0, 'aay', True),
StoragePolicy(1, 'bee', False), StoragePolicy(1, 'bee', False),