summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2023-04-26 15:37:11 -0700
committerTim Burke <tim.burke@gmail.com>2023-04-27 15:20:07 -0700
commit88941ebe464139bcf5e8f30ba498dd42817dfe08 (patch)
tree5ac172a1996d0ffcca8327eec02981f06a5c21af
parent9f7527973997baa5e685ea57d1563232234bc872 (diff)
downloadswift-88941ebe464139bcf5e8f30ba498dd42817dfe08.tar.gz
tests: Fix config numbers in test_versioning_with_metadata_replication
Closes-Bug: #2017021 Change-Id: If422f99a77245b35ab755857f9816c1e401a4e22
-rw-r--r--test/probe/test_object_versioning.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/probe/test_object_versioning.py b/test/probe/test_object_versioning.py
index 60ecae9a1..09a209f54 100644
--- a/test/probe/test_object_versioning.py
+++ b/test/probe/test_object_versioning.py
@@ -273,18 +273,18 @@ class TestECObjectVersioning(ECProbeTest):
self.fail('unable to find object on handoffs')
# we want to repair the fault, but avoid doing the handoff revert
self.revive_drive(failed_primary_device_path)
- handoff_config = (handoff['id'] + 1) % 4
- failed_config = (failed_primary['id'] + 1) % 4
+ handoff_config = self.config_number(handoff)
+ failed_config = self.config_number(failed_primary)
partner_nodes = reconstructor._get_partners(
failed_primary['index'], self.nodes)
random.shuffle(partner_nodes)
for partner in partner_nodes:
- fix_config = (partner['id'] + 1) % 4
+ fix_config = self.config_number(partner)
if fix_config not in (handoff_config, failed_config):
break
else:
self.fail('unable to find fix_config in %r excluding %r & %r' % (
- [(d['device'], (d['id'] + 1) % 4) for d in partner_nodes],
+ [(d['device'], self.config_number(d)) for d in partner_nodes],
handoff_config, failed_config))
self.reconstructor.once(number=fix_config)