From 6f5cd3232a26868e5753a6a615b5b645e9251f2d Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Wed, 3 Nov 2010 15:31:46 -0400
Subject: user-enable/disable improvements

Always display the account enable/disable status.

Don't ignore the exceptions when a user is already enabled or disabled.

Fix the exception error messages to use the right terminology.

In baseldap when retrieving all attributes include the default attributes
in case they include some operational attributes.

ticket 392
---
 tests/test_xmlrpc/test_user_plugin.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'tests')

diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py
index a1346f58..34096385 100644
--- a/tests/test_xmlrpc/test_user_plugin.py
+++ b/tests/test_xmlrpc/test_user_plugin.py
@@ -121,6 +121,7 @@ class test_user(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     memberof_group=[u'ipausers'],
+                    nsaccountlock=[u'False'],
                 ),
                 value=user1,
                 summary=None,
@@ -152,6 +153,7 @@ class test_user(Declarative):
                         'ipauniqueid': [fuzzy_uuid],
                         'mepmanagedentry': [u'cn=%s,cn=groups,cn=accounts,%s' % (user1, api.env.basedn)],
                         'krbpwdpolicyreference': [u'cn=global_policy,cn=%s,cn=kerberos,%s' % (api.env.realm, api.env.basedn)],
+                        'nsaccountlock': [u'False'],
                     },
                 ],
                 summary=u'1 user matched',
@@ -175,6 +177,7 @@ class test_user(Declarative):
                         sn=[u'User1'],
                         uid=[user1],
                         memberof_group=[u'ipausers'],
+                        nsaccountlock=[u'False'],
                     ),
                 ],
                 summary=u'1 user matched',
@@ -200,6 +203,7 @@ class test_user(Declarative):
                         memberof_group=[u'admins'],
                         memberof_rolegroup=[u'hostadmin', u'replicaadmin'],
                         memberof_taskgroup=[u'addhosts', u'removehosts', u'modifyhosts', u'manage_host_keytab', u'enroll_host', u'managereplica', u'deletereplica'],
+                        nsaccountlock=[u'False'],
                     ),
                     dict(
                         dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn,
@@ -209,6 +213,7 @@ class test_user(Declarative):
                         sn=[u'User1'],
                         uid=[user1],
                         memberof_group=[u'ipausers'],
+                        nsaccountlock=[u'False'],
                     ),
                 ],
                 summary=u'2 users matched',
@@ -234,6 +239,7 @@ class test_user(Declarative):
                         memberof_group=[u'admins'],
                         memberof_rolegroup=[u'hostadmin', u'replicaadmin'],
                         memberof_taskgroup=[u'addhosts', u'removehosts', u'modifyhosts', u'manage_host_keytab', u'enroll_host', u'managereplica', u'deletereplica'],
+                        nsaccountlock=[u'False'],
                     ),
                 ],
                 summary=u'1 user matched',
@@ -282,6 +288,7 @@ class test_user(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     memberof_group=[u'ipausers'],
+                    nsaccountlock=[u'False'],
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -301,6 +308,7 @@ class test_user(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     memberof_group=[u'ipausers'],
+                    nsaccountlock=[u'False'],
                 ),
                 summary=None,
                 value=user1,
@@ -320,6 +328,7 @@ class test_user(Declarative):
                     sn=[u'User1'],
                     uid=[renameduser1],
                     memberof_group=[u'ipausers'],
+                    nsaccountlock=[u'False'],
                 ),
                 summary=u'Modified user "%s"' % user1,
                 value=user1,
@@ -345,6 +354,7 @@ class test_user(Declarative):
                     sn=[u'User1'],
                     uid=[user1],
                     memberof_group=[u'ipausers'],
+                    nsaccountlock=[u'False'],
                 ),
                 summary=u'Modified user "%s"' % renameduser1,
                 value=renameduser1,
-- 
cgit