From 8df14b71362275f90b0f79d729e6348456fb5f76 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 11 Feb 2015 11:13:28 -0500 Subject: [PATCH] create a new get_acl helper to ensure proper xml is compared Signed-off-by: Alfredo Deza (cherry picked from commit 9b6ff638735d03c1f3304198fad51ca701a2c8bd) Conflicts: tasks/radosgw_admin.py the context changed but the patch seems otherwise good --- tasks/radosgw_admin.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py index 965d1b3b36ca3..193000d70e125 100644 --- a/tasks/radosgw_admin.py +++ b/tasks/radosgw_admin.py @@ -35,6 +35,26 @@ def successful_ops(out): return entry['total']['successful_ops'] +def get_acl(key): + """ + Helper function to get the xml acl from a key, ensuring that the xml + version tag is removed from the acl response + """ + raw_acl = key.get_xml_acl() + + def remove_version(string): + return string.split( + '' + )[-1] + + def remove_newlines(string): + return string.strip('\n') + + return remove_version( + remove_newlines(raw_acl) + ) + + def task(ctx, config): """ Test radosgw-admin functionality against a running rgw instance. @@ -894,7 +914,7 @@ def task(ctx, config): ['policy', '--bucket', bucket.name, '--object', key.key], check_status=True) - acl = key.get_xml_acl() + acl = get_acl(key) assert acl == out.strip('\n') @@ -905,7 +925,8 @@ def task(ctx, config): ['policy', '--bucket', bucket.name, '--object', key.key], check_status=True) - acl = key.get_xml_acl() + acl = get_acl(key) + assert acl == out.strip('\n') # TESTCASE 'rm-bucket', 'bucket', 'rm', 'bucket with objects', 'succeeds' -- 2.39.5