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_host_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_host_plugin.py')
-rw-r--r-- | tests/test_xmlrpc/test_host_plugin.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/test_xmlrpc/test_host_plugin.py b/tests/test_xmlrpc/test_host_plugin.py index 167481a45..753e3d2c1 100644 --- a/tests/test_xmlrpc/test_host_plugin.py +++ b/tests/test_xmlrpc/test_host_plugin.py @@ -65,7 +65,7 @@ class test_host(Declarative): command=('host_add', [fqdn1], dict( description=u'Test host 1', - localityname=u'Undisclosed location 1', + l=u'Undisclosed location 1', ), ), expected=dict( @@ -73,14 +73,11 @@ class test_host(Declarative): summary=u'Added host "%s"' % fqdn1, result=dict( dn=dn1, - cn=[fqdn1], # FIXME: we should only return fqdn fqdn=[fqdn1], description=[u'Test host 1'], - localityname=[u'Undisclosed location 1'], + l=[u'Undisclosed location 1'], krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)], - serverhostname=[u'testhost1'], objectclass=objectclasses.host, - managedby=[dn1], ipauniqueid=[fuzzy_uuid], ), ), @@ -109,7 +106,8 @@ class test_host(Declarative): dn=dn1, fqdn=[fqdn1], description=[u'Test host 1'], - localityname=[u'Undisclosed location 1'], + l=[u'Undisclosed location 1'], + krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)], ), ), ), @@ -150,9 +148,11 @@ class test_host(Declarative): summary=u'1 host matched', result=[ dict( + #dn=dn1, fqdn=[fqdn1], description=[u'Test host 1'], - localityname=[u'Undisclosed location 1'], + l=[u'Undisclosed location 1'], + krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)], ), ], ), @@ -195,6 +195,9 @@ class test_host(Declarative): summary=u'Modified host "%s"' % fqdn1, result=dict( description=[u'Updated host 1'], + fqdn=[fqdn1], + l=[u'Undisclosed location 1'], + krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)], ), ), ), @@ -210,7 +213,8 @@ class test_host(Declarative): dn=dn1, fqdn=[fqdn1], description=[u'Updated host 1'], - localityname=[u'Undisclosed location 1'], + l=[u'Undisclosed location 1'], + krbprincipalname=[u'host/%s@%s' % (fqdn1, api.env.realm)], ), ), ), |