From 5dabdcf045223101d6f73110d1057d2de2198a78 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Fri, 20 Mar 2015 09:27:05 -0400 Subject: [PATCH] ensure summary is looked for the user we need Signed-off-by: Alfredo Deza (cherry picked from commit f7ea0a424a53bf68cad4cd4c7c78a07401dd6851) --- tasks/radosgw_admin.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py index 193000d70e125..92cbe3007d84d 100644 --- a/tasks/radosgw_admin.py +++ b/tasks/radosgw_admin.py @@ -794,7 +794,7 @@ def task(ctx, config): while time.time() - timestamp <= (20 * 60): # wait up to 20 minutes (err, out) = rgwadmin(ctx, client, ['usage', 'show', '--categories', 'delete_obj']) # last operation we did is delete obj, wait for it to flush if successful_ops(out) > 0: - break; + break time.sleep(1) assert time.time() - timestamp <= (20 * 60) @@ -803,7 +803,16 @@ def task(ctx, config): (err, out) = rgwadmin(ctx, client, ['usage', 'show'], check_status=True) assert len(out['entries']) > 0 assert len(out['summary']) > 0 - user_summary = out['summary'][0] + + # find summary for user1 + user_summary = None + for summary in out['summary']: + if summary.get('user') == user1: + user_summary = summary + + if not user_summary: + raise AssertionError('No summary info found for user: %s' % user1) + total = user_summary['total'] assert total['successful_ops'] > 0 -- 2.39.5