From 99305b93000f28530731c05b34c69e0c7ce0463f Mon Sep 17 00:00:00 2001 From: Samuel Merritt Date: Mon, 2 May 2016 17:29:32 -0700 Subject: [PATCH] Fix probe tests from commit cf48e75 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 --- test/probe/test_container_failures.py | 2 +- test/probe/test_object_failures.py | 2 +- test/probe/test_object_handoff.py | 8 ++++---- test/probe/test_reconstructor_revert.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/probe/test_container_failures.py b/test/probe/test_container_failures.py index 3076ba7922..d8c132c53d 100755 --- a/test/probe/test_container_failures.py +++ b/test/probe/test_container_failures.py @@ -133,7 +133,7 @@ class TestContainerFailures(ReplProbeTest): onode = onodes[0] db_files = [] for onode in onodes: - node_id = (onode['port'] - 6200) / 10 + node_id = (onode['port'] - 6000) / 10 device = onode['device'] hash_str = hash_path(self.account, container) server_conf = readconf(self.configs['container-server'][node_id]) diff --git a/test/probe/test_object_failures.py b/test/probe/test_object_failures.py index b290a4ec05..ba53177743 100755 --- a/test/probe/test_object_failures.py +++ b/test/probe/test_object_failures.py @@ -61,7 +61,7 @@ class TestObjectFailures(ReplProbeTest): opart, onodes = self.object_ring.get_nodes( self.account, container, obj) onode = onodes[0] - node_id = (onode['port'] - 6200) / 10 + node_id = (onode['port'] - 6000) / 10 device = onode['device'] hash_str = hash_path(self.account, container, obj) obj_server_conf = readconf(self.configs['object-server'][node_id]) diff --git a/test/probe/test_object_handoff.py b/test/probe/test_object_handoff.py index 1b9bd29cba..a360021b7c 100755 --- a/test/probe/test_object_handoff.py +++ b/test/probe/test_object_handoff.py @@ -134,13 +134,13 @@ class TestObjectHandoff(ReplProbeTest): port_num = node['replication_port'] except KeyError: port_num = node['port'] - node_id = (port_num - 6200) / 10 + node_id = (port_num - 6000) / 10 Manager(['object-replicator']).once(number=node_id) try: another_port_num = another_onode['replication_port'] except KeyError: 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) # Assert the first container/obj primary server now has container/obj @@ -230,9 +230,9 @@ class TestObjectHandoff(ReplProbeTest): port_num = node['replication_port'] except KeyError: port_num = node['port'] - node_id = (port_num - 6200) / 10 + node_id = (port_num - 6000) / 10 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) # Assert primary node no longer has container/obj diff --git a/test/probe/test_reconstructor_revert.py b/test/probe/test_reconstructor_revert.py index 845ff1a292..095843624c 100755 --- a/test/probe/test_reconstructor_revert.py +++ b/test/probe/test_reconstructor_revert.py @@ -131,7 +131,7 @@ class TestReconstructorRevert(ECProbeTest): # fire up reconstructor on handoff nodes only for hnode in hnodes: - hnode_id = (hnode['port'] - 6200) / 10 + hnode_id = (hnode['port'] - 6000) / 10 self.reconstructor.once(number=hnode_id) # first three primaries have data again