diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-02-12 16:34:21 -0500 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2010-02-15 13:10:11 -0700 |
| commit | 58746226d4b36bc40de91d4d1dd283e9faaff639 (patch) | |
| tree | 11c4cd42b0285ff366c68274495cd1e9ee7fa7da /tests/test_xmlrpc/test_taskgroup_plugin.py | |
| parent | 99dcf9d4f97ac8bff112d6ccc36bb5b894fa5bcd (diff) | |
| download | freeipa-58746226d4b36bc40de91d4d1dd283e9faaff639.tar.gz freeipa-58746226d4b36bc40de91d4d1dd283e9faaff639.tar.xz freeipa-58746226d4b36bc40de91d4d1dd283e9faaff639.zip | |
Use the Output tuple to determine the order of output
The attributes displayed is now dependant upon their definition in
a Param. This enhances that, giving some level of control over how
the result is displayed to the user.
This also fixes displaying group membership, including failures of
adding/removing entries.
All tests pass now though there is still one problem. We need to
return the dn as well. Once that is fixed we just need to comment
out all the dn entries in the tests and they should once again
pass.
Diffstat (limited to 'tests/test_xmlrpc/test_taskgroup_plugin.py')
| -rw-r--r-- | tests/test_xmlrpc/test_taskgroup_plugin.py | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/tests/test_xmlrpc/test_taskgroup_plugin.py b/tests/test_xmlrpc/test_taskgroup_plugin.py index 191880a35..42e0ac503 100644 --- a/tests/test_xmlrpc/test_taskgroup_plugin.py +++ b/tests/test_xmlrpc/test_taskgroup_plugin.py @@ -170,8 +170,10 @@ class test_taskgroup(Declarative): ), ), result={ - 'member rolegroup': [rolegroup1], - 'member group': [group1], + 'cn': [taskgroup1], + 'description': [u'Test desc 1'], + 'member_rolegroup': [rolegroup1], + 'member_group': [group1], } ), ), @@ -187,8 +189,8 @@ class test_taskgroup(Declarative): 'dn': taskgroup1_dn, 'cn': [taskgroup1], 'description': [u'Test desc 1'], - 'member rolegroup': [rolegroup1], - 'member group': [group1], + 'member_rolegroup': [rolegroup1], + 'member_group': [group1], }, ), ), @@ -203,12 +205,11 @@ class test_taskgroup(Declarative): summary=u'1 taskgroup matched', result=[ { - # FIXME: crud.Search subclasses should return 'dn' also #'dn': taskgroup1_dn, 'cn': [taskgroup1], 'description': [u'Test desc 1'], - 'member rolegroup': [rolegroup1], - 'member group': [group1], + 'member_rolegroup': [rolegroup1], + 'member_group': [group1], }, ], ), @@ -224,10 +225,11 @@ class test_taskgroup(Declarative): summary=u'1 taskgroup matched', result=[ { + #'dn': taskgroup1_dn, 'cn': [taskgroup1], 'description': [u'Test desc 1'], - 'member rolegroup': [rolegroup1], - 'member group': [group1], + 'member_rolegroup': [rolegroup1], + 'member_group': [group1], }, ], ), @@ -261,12 +263,11 @@ class test_taskgroup(Declarative): summary=u'1 taskgroup matched', result=[ { - # FIXME: crud.Search subclasses should return 'dn' also #'dn': taskgroup1_dn, 'cn': [taskgroup1], 'description': [u'Test desc 1'], - 'member rolegroup': [rolegroup1], - 'member group': [group1], + 'member_rolegroup': [rolegroup1], + 'member_group': [group1], }, ], ), @@ -282,12 +283,14 @@ class test_taskgroup(Declarative): summary=u'2 taskgroups matched', result=[ { + #'dn': taskgroup1_dn, 'cn': [taskgroup1], 'description': [u'Test desc 1'], - 'member rolegroup': [rolegroup1], - 'member group': [group1], + 'member_rolegroup': [rolegroup1], + 'member_group': [group1], }, { + #'dn': taskgroup2_dn, 'cn': [taskgroup2], 'description': [u'Test desc 2'], }, @@ -305,7 +308,11 @@ class test_taskgroup(Declarative): value=taskgroup1, summary=u'Modified taskgroup "test-taskgroup-1"', result=dict( + cn=[taskgroup1], description=[u'New desc 1'], + member_rolegroup=[rolegroup1], + member_group=[group1], + ), ), ), @@ -321,8 +328,8 @@ class test_taskgroup(Declarative): 'dn': taskgroup1_dn, 'cn': [taskgroup1], 'description': [u'New desc 1'], - 'member rolegroup': [rolegroup1], - 'member group': [group1], + 'member_rolegroup': [rolegroup1], + 'member_group': [group1], }, ), ), @@ -343,7 +350,7 @@ class test_taskgroup(Declarative): ), ), result={ - 'member rolegroup': [rolegroup1], + 'member_rolegroup': [rolegroup1], } ), ), @@ -390,6 +397,7 @@ class test_taskgroup(Declarative): summary=u'1 taskgroup matched', result=[ { + #'dn': taskgroup2_dn, 'cn': [taskgroup2], 'description': [u'Test desc 2'], }, |