summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/test_xmlrpc/test_hbac_plugin.py6
-rw-r--r--tests/test_xmlrpc/test_permission_plugin.py4
-rw-r--r--tests/test_xmlrpc/test_service_plugin.py4
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 268c8d9d2..bbaf9d25b 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 2ce1bdf31..51546732c 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 501cf024e..2e51b2ccf 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,