From 9b6ff638735d03c1f3304198fad51ca701a2c8bd 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 --- tasks/radosgw_admin.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py index 9a51ac66b6d8b..d0d6c2139e654 100644 --- a/tasks/radosgw_admin.py +++ b/tasks/radosgw_admin.py @@ -52,6 +52,27 @@ def send_raw_http_request(conn, method, bucket_name, key_name, follow_redirects h.follow_redirects = follow_redirects return h.request(url, method) + +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. @@ -920,7 +941,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') @@ -931,7 +952,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