diff --git a/tests/integration/standard/test_metadata.py b/tests/integration/standard/test_metadata.py index 32be266c..60a819b0 100644 --- a/tests/integration/standard/test_metadata.py +++ b/tests/integration/standard/test_metadata.py @@ -349,9 +349,9 @@ class TestCodeCoverage(unittest.TestCase): self.assertNotEqual(list(get_replicas('test3rf', ring[0])), []) for i, token in enumerate(ring): - self.assertEqual(get_replicas('test3rf', token), set(owners)) - self.assertEqual(get_replicas('test2rf', token), set([owners[i], owners[(i + 1) % 3]])) - self.assertEqual(get_replicas('test1rf', token), set([owners[i]])) + self.assertEqual(set(get_replicas('test3rf', token)), set(owners)) + self.assertEqual(set(get_replicas('test2rf', token)), set([owners[i], owners[(i + 1) % 3]])) + self.assertEqual(set(get_replicas('test1rf', token)), set([owners[i]])) class TokenMetadataTest(unittest.TestCase): @@ -379,15 +379,15 @@ class TokenMetadataTest(unittest.TestCase): # tokens match node tokens exactly for token, expected_host in zip(tokens, hosts): replicas = token_map.get_replicas("ks", token) - self.assertEqual(replicas, set([expected_host])) + self.assertEqual(set(replicas), set([expected_host])) # shift the tokens back by one for token, expected_host in zip(tokens[1:], hosts[1:]): replicas = token_map.get_replicas("ks", MD5Token(str(token.value - 1))) - self.assertEqual(replicas, set([expected_host])) + self.assertEqual(set(replicas), set([expected_host])) # shift the tokens forward by one for i, token in enumerate(tokens): replicas = token_map.get_replicas("ks", MD5Token(str(token.value + 1))) expected_host = hosts[(i + 1) % len(hosts)] - self.assertEqual(replicas, set([expected_host])) + self.assertEqual(set(replicas), set([expected_host])) diff --git a/tests/unit/test_metadata.py b/tests/unit/test_metadata.py index 199c8659..f52c9c32 100644 --- a/tests/unit/test_metadata.py +++ b/tests/unit/test_metadata.py @@ -96,7 +96,7 @@ class TestStrategies(unittest.TestCase): nts = NetworkTopologyStrategy({'dc1': 1, 'dc2': 0}) replica_map = nts.make_token_replica_map(token_to_host_owner, ring) - self.assertEqual(replica_map[MD5Token(0)], set([host])) + self.assertEqual(set(replica_map[MD5Token(0)]), set([host])) def test_nts_export_for_schema(self): # TODO: Cover NetworkTopologyStrategy.export_for_schema() diff --git a/tests/unit/test_policies.py b/tests/unit/test_policies.py index d461295c..ab993004 100644 --- a/tests/unit/test_policies.py +++ b/tests/unit/test_policies.py @@ -351,7 +351,7 @@ class TokenAwarePolicyTest(unittest.TestCase): self.assertEqual(policy.distance(remote_host), HostDistance.IGNORED) # dc2 isn't registered in the policy's live_hosts dict - policy.child_policy.used_hosts_per_remote_dc = 1 + policy._child_policy.used_hosts_per_remote_dc = 1 self.assertEqual(policy.distance(remote_host), HostDistance.IGNORED) # make sure the policy has both dcs registered