Fix unit tests to work with new comma-support, validation requirements

This commit is contained in:
Rob Crittenden 2012-03-23 15:09:54 -04:00 committed by Martin Kosek
parent cfafc415f3
commit a672483118
3 changed files with 7 additions and 7 deletions

View File

@ -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):

View File

@ -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(

View File

@ -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,