openstack/swift
Code Issues Proposed changes

Merge "tests: Fix flaky reconciler test"

Browse Source
This commit is contained in:
Zuul
2025-02-10 20:21:26 +00:00
committed by Gerrit Code Review
parent 73201cc12d 3ccf749043
commit 364a47b176
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/unit/container/test_reconciler.py
View File

@@ -12,7 +12,6 @@
# limitations under the License. # limitations under the License.
import json import json
import numbers
import shutil import shutil
from functools import partial from functools import partial
from tempfile import mkdtemp from tempfile import mkdtemp
@@ -140,6 +139,8 @@ class FakeInternalClient(reconciler.InternalClient):
continue continue
obj_path = swob.str_to_wsgi( obj_path = swob.str_to_wsgi(
container_path + '/' + obj_name) container_path + '/' + obj_name)
# some tests setup mock listings using floats, some use
# strings, so normalize here
ts = Timestamp(timestamp) ts = Timestamp(timestamp)
headers = {'X-Timestamp': ts.normal, headers = {'X-Timestamp': ts.normal,
'X-Backend-Timestamp': ts.internal} 'X-Backend-Timestamp': ts.internal}
@@ -149,17 +150,12 @@ class FakeInternalClient(reconciler.InternalClient):
self.app.storage_policy[storage_policy_index].register( self.app.storage_policy[storage_policy_index].register(
'DELETE', obj_path, swob.HTTPNoContent, {}) 'DELETE', obj_path, swob.HTTPNoContent, {})
# container listing entry # container listing entry
last_modified = timestamp_to_last_modified(timestamp)
# some tests setup mock listings using floats, some use
# strings, so normalize here
if isinstance(timestamp, numbers.Number):
timestamp = '%f' % timestamp
obj_data = { obj_data = {
'bytes': 0, 'bytes': 0,
# listing data is unicode # listing data is unicode
'name': obj_name, 'name': obj_name,
'last_modified': last_modified, 'last_modified': ts.isoformat,
'hash': timestamp, 'hash': ts.internal,
'content_type': content_type, 'content_type': content_type,
} }
container_listing_data.append(obj_data) container_listing_data.append(obj_data)