Rob Crittenden wrote:
Set new minimum version of 389-ds-base to fix db corruption during
upgrade problem.

This patch is against 2.2.

Corrected changelog entry.
>From f1863efafac2f3eae86295e174f1f4296d201d93 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcrit...@redhat.com>
Date: Fri, 23 Mar 2012 15:09:54 -0400
Subject: [PATCH] Fix unit tests to work with new comma-support, validation
 requirements

---
 tests/test_xmlrpc/test_hbac_plugin.py       |    6 +++---
 tests/test_xmlrpc/test_permission_plugin.py |    4 ++--
 tests/test_xmlrpc/test_service_plugin.py    |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/test_xmlrpc/test_hbac_plugin.py b/tests/test_xmlrpc/test_hbac_plugin.py
index 268c8d9d2217de71a936f691e5dc1666e9afb4b1..bbaf9d25b5b1bca524bc4a02a16c484d6e0ebc99 100644
--- a/tests/test_xmlrpc/test_hbac_plugin.py
+++ b/tests/test_xmlrpc/test_hbac_plugin.py
@@ -424,7 +424,7 @@ class test_hbac(XMLRPC_test):
         """
         api.Command['hbacrule_mod'](self.rule_name, usercategory=u'all')
         try:
-            api.Command['hbacrule_add_user'](self.rule_name, users='admin')
+            api.Command['hbacrule_add_user'](self.rule_name, users=u'admin')
         finally:
             api.Command['hbacrule_mod'](self.rule_name, usercategory=u'')
 
@@ -433,11 +433,11 @@ class test_hbac(XMLRPC_test):
         """
         Test setting usercat='all' in an HBAC rule when there are users
         """
-        api.Command['hbacrule_add_user'](self.rule_name, user='admin')
+        api.Command['hbacrule_add_user'](self.rule_name, user=u'admin')
         try:
             api.Command['hbacrule_mod'](self.rule_name, usercategory=u'all')
         finally:
-            api.Command['hbacrule_remove_user'](self.rule_name, user='admin')
+            api.Command['hbacrule_remove_user'](self.rule_name, user=u'admin')
 
     @raises(errors.MutuallyExclusiveError)
     def test_h_hbacrule_exclusivehost(self):
diff --git a/tests/test_xmlrpc/test_permission_plugin.py b/tests/test_xmlrpc/test_permission_plugin.py
index 2ce1bdf31e1bb3022059088d84acb4267f8423a3..51546732ca3ca4b3eea777024d0e9a21b75b83cf 100644
--- a/tests/test_xmlrpc/test_permission_plugin.py
+++ b/tests/test_xmlrpc/test_permission_plugin.py
@@ -661,8 +661,8 @@ class test_permission(Declarative):
             command=(
                 'permission_add', [permission1], dict(
                      type=u'hostgroup',
-                     permissions=u'add,delete,write',
-                     attrs=u'businessCategory,owner,description',
+                     permissions=[u'add', u'delete', u'write'],
+                     attrs=[u'businessCategory', u'owner', u'description'],
                 )
             ),
             expected=dict(
diff --git a/tests/test_xmlrpc/test_service_plugin.py b/tests/test_xmlrpc/test_service_plugin.py
index 501cf024edc17e86ff62e79a2626b2eba3b9818c..2e51b2ccf39883a8455aa67906123c3f3364b78b 100644
--- a/tests/test_xmlrpc/test_service_plugin.py
+++ b/tests/test_xmlrpc/test_service_plugin.py
@@ -271,7 +271,7 @@ class test_service(Declarative):
 
         dict(
             desc='Add non-existent host to %r' % service1,
-            command=('service_add_host', [service1], dict(host='notfound')),
+            command=('service_add_host', [service1], dict(host=u'notfound')),
             expected=dict(
                 failed=dict(managedby=dict(host=[(u'notfound', u'no such entry')])),
                 completed=0,
@@ -286,7 +286,7 @@ class test_service(Declarative):
 
         dict(
             desc='Remove non-existent host from %r' % service1,
-            command=('service_remove_host', [service1], dict(host='notfound')),
+            command=('service_remove_host', [service1], dict(host=u'notfound')),
             expected=dict(
                 failed=dict(managedby=dict(host=[(u'notfound', u'This entry is not a member')])),
                 completed=0,
-- 
1.7.6

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to