From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 20 Mar 2015 13:27:05 +0000 (-0400)
Subject: ensure summary is looked for the user we need
X-Git-Tag: v0.94.10~27^2^2~137
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b6c2e978d6ba16b2744a374d255d65d027553bbb;p=ceph.git

ensure summary is looked for the user we need

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f7ea0a424a53bf68cad4cd4c7c78a07401dd6851)
---

diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py
index d0d6c2139e6..819e349f1fe 100644
--- a/tasks/radosgw_admin.py
+++ b/tasks/radosgw_admin.py
@@ -821,7 +821,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)
@@ -830,7 +830,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