IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-26 16:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

test_batch_plugin: fix py2/3 failing assertion

Browse Source 
When running "test_batch_plugin" with Py2 against Py3 server we
got assertion error due to a command trying to run as bytes.

E.g.: unknown command 'b'ping''

https://pagure.io/freeipa/issue/7131

Reviewed-By: Christian Heimes <cheimes@redhat.com>
This commit is contained in:
Michal Reznik 2017-11-29 10:00:22 +01:00 committed by Christian Heimes
parent f45d72af83
commit 1ec3d54d55
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ipatests/test_xmlrpc/test_batch_plugin.py
View File

@ -60,7 +60,7 @@ class test_batch(Declarative):
dict(
desc='Batch ping',
command=('batch', [dict(method='ping', params=([], {}))], {}),
command=('batch', [dict(method=u'ping', params=([], {}))], {}),
expected=dict(
count=1,
results=[
@ -71,7 +71,7 @@ class test_batch(Declarative):
dict(
desc='Batch two pings',
command=('batch', [dict(method='ping', params=([], {}))] * 2, {}),
command=('batch', [dict(method=u'ping', params=([], {}))] * 2, {}),
expected=dict(
count=2,
results=[
@ -84,9 +84,9 @@ class test_batch(Declarative):
dict(
desc='Create and deleting a group',
command=('batch', [
dict(method='group_add',
dict(method=u'group_add',
params=([group1], dict(description=u'Test desc 1'))),
dict(method='group_del', params=([group1], dict())),
dict(method=u'group_del', params=([group1], dict())),
], {}),
expected=dict(
count=2,
@ -118,8 +118,8 @@ class test_batch(Declarative):
dict(
desc='Try to delete nonexistent group twice',
command=('batch', [
dict(method='group_del', params=([group1], dict())),
dict(method='group_del', params=([group1], dict())),
dict(method=u'group_del', params=([group1], dict())),
dict(method=u'group_del', params=([group1], dict())),
], {}),
expected=dict(
count=2,
@ -147,8 +147,8 @@ class test_batch(Declarative):
dict(
desc='Try to delete non-existent group first, then create it',
command=('batch', [
dict(method='group_del', params=([group1], dict())),
dict(method='group_add',
dict(method=u'group_del', params=([group1], dict())),
dict(method=u'group_add',
params=([group1], dict(description=u'Test desc 1'))),
], {}),
expected=dict(
@ -185,19 +185,19 @@ class test_batch(Declarative):
desc='Try bad command invocations',
command=('batch', [
# bad command name
dict(method='nonexistent_ipa_command', params=([], dict())),
dict(method=u'nonexistent_ipa_command', params=([], dict())),
# dash, not underscore, in command name
dict(method='user-del', params=([], dict())),
dict(method=u'user-del', params=([], dict())),
# missing command name
dict(params=([group1], dict())),
# missing params
dict(method='user_del'),
dict(method=u'user_del'),
# missing required argument
dict(method='user_add', params=([], dict())),
dict(method=u'user_add', params=([], dict())),
# missing required option
dict(method='user_add', params=([], dict(givenname=first1))),
dict(method=u'user_add', params=([], dict(givenname=first1))),
# bad type
dict(method='group_add', params=([group1], dict(
dict(method=u'group_add', params=([group1], dict(
description=u't', gidnumber=u'bad'))),
], {}),
expected=dict(