openstack/swift
Code Issues Proposed changes

tests: Fix probe test when encryption is enabled

Browse Source 
Change-Id: I94e8cfd154aa058d91255efc87776224a919f572
This commit is contained in:
Tim Burke
2023-06-04 21:06:13 -07:00
parent 2331c9abf2
commit 7e3925aa9c
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/probe/test_object_versioning.py
View File

@@ -301,13 +301,19 @@ class TestECObjectVersioning(ECProbeTest):
missing.append(node) missing.append(node)
continue continue
etags.add(headers['X-Object-Sysmeta-Ec-Etag']) etags.add(headers['X-Object-Sysmeta-Ec-Etag'])
metadata.append(headers['X-Object-Meta-Bar']) metadata.append(headers.get(
'X-Object-Transient-Sysmeta-Crypto-Meta-Bar',
headers['X-Object-Meta-Bar']))
if missing: if missing:
self.fail('Ran reconstructor config #%s to repair %r but ' self.fail('Ran reconstructor config #%s to repair %r but '
'found 404 on primary: %r' % ( 'found 404 on primary: %r' % (
fix_config, failed_primary['device'], fix_config, failed_primary['device'],
[d['device'] for d in missing])) [d['device'] for d in missing]))
self.assertEqual(1, len(etags)) self.assertEqual(1, len(etags))
if 'X-Object-Transient-Sysmeta-Crypto-Meta-Bar' in headers:
self.assertEqual(len(self.nodes), len(metadata))
self.assertEqual(1, len(set(metadata)))
else:
self.assertEqual(['meta-bar'] * len(self.nodes), metadata) self.assertEqual(['meta-bar'] * len(self.nodes), metadata)
# process revert # process revert
self.reconstructor.once(number=handoff_config) self.reconstructor.once(number=handoff_config)
@@ -317,8 +323,14 @@ class TestECObjectVersioning(ECProbeTest):
for node in self.nodes: for node in self.nodes:
headers, etag = self.direct_get(node, self.part) headers, etag = self.direct_get(node, self.part)
etags.add(headers['X-Object-Sysmeta-Ec-Etag']) etags.add(headers['X-Object-Sysmeta-Ec-Etag'])
metadata.append(headers['X-Object-Meta-Bar']) metadata.append(headers.get(
'X-Object-Transient-Sysmeta-Crypto-Meta-Bar',
headers['X-Object-Meta-Bar']))
self.assertEqual(1, len(etags)) self.assertEqual(1, len(etags))
if 'X-Object-Transient-Sysmeta-Crypto-Meta-Bar' in headers:
self.assertEqual(len(self.nodes), len(metadata))
self.assertEqual(1, len(set(metadata)))
else:
self.assertEqual(['meta-bar'] * len(self.nodes), metadata) self.assertEqual(['meta-bar'] * len(self.nodes), metadata)
# and removed form handoff # and removed form handoff
with self.assertRaises(direct_client.DirectClientException) as ctx: with self.assertRaises(direct_client.DirectClientException) as ctx: