diff options
| author | Zuul <zuul@review.opendev.org> | 2023-04-28 11:37:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-04-28 11:37:07 +0000 |
| commit | 80770eb57b28d6e3e550f95772be8b4582c9225e (patch) | |
| tree | 87eb5f8eb2857cd5d144ac3e93a022a0c2f8dd1e | |
| parent | 31e51b3f8580d01f8da8a0b6d1415b406a82ff1e (diff) | |
| parent | 88941ebe464139bcf5e8f30ba498dd42817dfe08 (diff) | |
| download | swift-80770eb57b28d6e3e550f95772be8b4582c9225e.tar.gz | |
Merge "tests: Fix config numbers in test_versioning_with_metadata_replication"
| -rw-r--r-- | test/probe/test_object_versioning.py | 8 |
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) |