From ec1f65026204265a497f123420a9edcca35d81dc Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 2 Jun 2010 16:47:07 +0000
Subject: [PATCH] Monotone-Parent: a79adaa6f36ea178ca12ab0e347e8def006787cc
 Monotone-Revision: ad7209d4c578d84bbeceb61506c1e6ed592106da

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-02T16:47:07
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                      | 4 ++++
 Tests/Integration/utilities.py | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7b79fa459..d208bd4e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-06-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* Tests/Integration/utilities.py (TestACLUtility.setupRights): we
+	excape the value for the "user" attribute with
+	xml.sax.saxutils.escape.
+
 	* Tests/Integration/webdavlib.py (HTTPPUT.__init__): added the
 	"content_type" and "exclusive" optional parameters. The latter
 	implies the use of the "if-none-match" header.
diff --git a/Tests/Integration/utilities.py b/Tests/Integration/utilities.py
index 5d858f181..352ad342d 100644
--- a/Tests/Integration/utilities.py
+++ b/Tests/Integration/utilities.py
@@ -2,6 +2,7 @@
 
 import unittest
 import webdavlib
+import xml.sax.saxutils
 
 class TestUtility():
     def __init__(self, test, client, resource = None):
@@ -69,7 +70,7 @@ class TestACLUtility(TestUtility):
         aclQuery = ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
                     + "<acl-query"
                     + " xmlns=\"urn:inverse:params:xml:ns:inverse-dav\">"
-                    + "<set-roles user=\"%s\">%s</set-roles>" % (username,
+                    + "<set-roles user=\"%s\">%s</set-roles>" % (xml.sax.saxutils.escape(username),
                                                                  rights_str)
                     + "</acl-query>")