openstack/swift
Code Issues Proposed changes

Fix probe tests from commit cf48e75

Browse Source 
Commit cf48e75 changed the default account/container/object ports in a
lot of places, including the probetests. However, it didn't change
them in doc/saio/bin/remakerings, and since the probe tests must match
the rings, they started failing.

This commit just backs out the changes to the test/probe directory so
that remakerings and the probe tests match again.

Change-Id: I316a09e6ee1a911f37ce9df3d641644739f88eeb
This commit is contained in:
Samuel Merritt 2016-05-02 17:29:32 -07:00
parent 2bf5eb775f
commit 99305b9300
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/probe/test_container_failures.py
View File

@ -133,7 +133,7 @@ class TestContainerFailures(ReplProbeTest):
onode = onodes[0] onode = onodes[0]
db_files = [] db_files = []
for onode in onodes: for onode in onodes:
node_id = (onode['port'] - 6200) / 10 node_id = (onode['port'] - 6000) / 10
device = onode['device'] device = onode['device']
hash_str = hash_path(self.account, container) hash_str = hash_path(self.account, container)
server_conf = readconf(self.configs['container-server'][node_id]) server_conf = readconf(self.configs['container-server'][node_id])

2
test/probe/test_object_failures.py
View File

@ -61,7 +61,7 @@ class TestObjectFailures(ReplProbeTest):
opart, onodes = self.object_ring.get_nodes( opart, onodes = self.object_ring.get_nodes(
self.account, container, obj) self.account, container, obj)
onode = onodes[0] onode = onodes[0]
node_id = (onode['port'] - 6200) / 10 node_id = (onode['port'] - 6000) / 10
device = onode['device'] device = onode['device']
hash_str = hash_path(self.account, container, obj) hash_str = hash_path(self.account, container, obj)
obj_server_conf = readconf(self.configs['object-server'][node_id]) obj_server_conf = readconf(self.configs['object-server'][node_id])

8
test/probe/test_object_handoff.py
View File

@ -134,13 +134,13 @@ class TestObjectHandoff(ReplProbeTest):
port_num = node['replication_port'] port_num = node['replication_port']
except KeyError: except KeyError:
port_num = node['port'] port_num = node['port']
node_id = (port_num - 6200) / 10 node_id = (port_num - 6000) / 10
Manager(['object-replicator']).once(number=node_id) Manager(['object-replicator']).once(number=node_id)
try: try:
another_port_num = another_onode['replication_port'] another_port_num = another_onode['replication_port']
except KeyError: except KeyError:
another_port_num = another_onode['port'] another_port_num = another_onode['port']
another_num = (another_port_num - 6200) / 10 another_num = (another_port_num - 6000) / 10
Manager(['object-replicator']).once(number=another_num) Manager(['object-replicator']).once(number=another_num)
# Assert the first container/obj primary server now has container/obj # Assert the first container/obj primary server now has container/obj
@ -230,9 +230,9 @@ class TestObjectHandoff(ReplProbeTest):
port_num = node['replication_port'] port_num = node['replication_port']
except KeyError: except KeyError:
port_num = node['port'] port_num = node['port']
node_id = (port_num - 6200) / 10 node_id = (port_num - 6000) / 10
Manager(['object-replicator']).once(number=node_id) Manager(['object-replicator']).once(number=node_id)
another_node_id = (another_port_num - 6200) / 10 another_node_id = (another_port_num - 6000) / 10
Manager(['object-replicator']).once(number=another_node_id) Manager(['object-replicator']).once(number=another_node_id)
# Assert primary node no longer has container/obj # Assert primary node no longer has container/obj

2
test/probe/test_reconstructor_revert.py
View File

@ -131,7 +131,7 @@ class TestReconstructorRevert(ECProbeTest):
# fire up reconstructor on handoff nodes only # fire up reconstructor on handoff nodes only
for hnode in hnodes: for hnode in hnodes:
hnode_id = (hnode['port'] - 6200) / 10 hnode_id = (hnode['port'] - 6000) / 10
self.reconstructor.once(number=hnode_id) self.reconstructor.once(number=hnode_id)
# first three primaries have data again # first three primaries have data again