openstack/deb-python-cassandra-driver
Code Issues Proposed changes

Patch tests to work with recently patched code

Browse Source
This commit is contained in:
Joaquin Casares
2013-12-12 20:03:39 -06:00
parent fb8aeada27
commit c41c9f17de
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/integration/standard/test_metadata.py
View File

@@ -349,9 +349,9 @@ class TestCodeCoverage(unittest.TestCase):
self.assertNotEqual(list(get_replicas('test3rf', ring[0])), []) self.assertNotEqual(list(get_replicas('test3rf', ring[0])), [])
for i, token in enumerate(ring): for i, token in enumerate(ring):
self.assertEqual(get_replicas('test3rf', token), set(owners)) self.assertEqual(set(get_replicas('test3rf', token)), set(owners))
self.assertEqual(get_replicas('test2rf', token), set([owners[i], owners[(i + 1) % 3]])) self.assertEqual(set(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('test1rf', token)), set([owners[i]]))
class TokenMetadataTest(unittest.TestCase): class TokenMetadataTest(unittest.TestCase):
@@ -379,15 +379,15 @@ class TokenMetadataTest(unittest.TestCase):
# tokens match node tokens exactly # tokens match node tokens exactly
for token, expected_host in zip(tokens, hosts): for token, expected_host in zip(tokens, hosts):
replicas = token_map.get_replicas("ks", token) 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 # shift the tokens back by one
for token, expected_host in zip(tokens[1:], hosts[1:]): for token, expected_host in zip(tokens[1:], hosts[1:]):
replicas = token_map.get_replicas("ks", MD5Token(str(token.value - 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 # shift the tokens forward by one
for i, token in enumerate(tokens): for i, token in enumerate(tokens):
replicas = token_map.get_replicas("ks", MD5Token(str(token.value + 1))) replicas = token_map.get_replicas("ks", MD5Token(str(token.value + 1)))
expected_host = hosts[(i + 1) % len(hosts)] expected_host = hosts[(i + 1) % len(hosts)]
self.assertEqual(replicas, set([expected_host])) self.assertEqual(set(replicas), set([expected_host]))

2
tests/unit/test_metadata.py
View File

@@ -96,7 +96,7 @@ class TestStrategies(unittest.TestCase):
nts = NetworkTopologyStrategy({'dc1': 1, 'dc2': 0}) nts = NetworkTopologyStrategy({'dc1': 1, 'dc2': 0})
replica_map = nts.make_token_replica_map(token_to_host_owner, ring) 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): def test_nts_export_for_schema(self):
# TODO: Cover NetworkTopologyStrategy.export_for_schema() # TODO: Cover NetworkTopologyStrategy.export_for_schema()

2
tests/unit/test_policies.py
View File

@@ -351,7 +351,7 @@ class TokenAwarePolicyTest(unittest.TestCase):
self.assertEqual(policy.distance(remote_host), HostDistance.IGNORED) self.assertEqual(policy.distance(remote_host), HostDistance.IGNORED)
# dc2 isn't registered in the policy's live_hosts dict # 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) self.assertEqual(policy.distance(remote_host), HostDistance.IGNORED)
# make sure the policy has both dcs registered # make sure the policy has both dcs registered