From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 11 Feb 2015 16:13:28 +0000 (-0500)
Subject: create a new get_acl helper to ensure proper xml is compared
X-Git-Tag: v0.94.10~27^2^2~145
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0ac3516e343dbc32b2b3391e59a6e09a11eef90;p=ceph.git

create a new get_acl helper to ensure proper xml is compared

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

diff --git a/tasks/radosgw_admin.py b/tasks/radosgw_admin.py
index 9a51ac66b6d..d0d6c2139e6 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(
+            '<?xml version="1.0" encoding="UTF-8"?>'
+        )[-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'