Convert nsaccountlock to always work as bool towards Python code

https://fedorahosted.org/freeipa/ticket/1259

Python code will see nsaccountlock as bool. JavaScript code will also see it as bool.

This allows native boolean operations with the lock field. Passes both CLI and WebUI tests.

3 files changed, 24 insertions, 24 deletions

diff --git a/tests/test_xmlrpc/test_attr.py b/tests/test_xmlrpc/test_attr.py
index 198251fcd..9f1b1c51d 100644
--- a/tests/test_xmlrpc/test_attr.py
+++ b/tests/test_xmlrpc/test_attr.py
@@ -83,7 +83,7 @@ class test_attr(Declarative):
                     gidnumber=[fuzzy_digits],
                     mail=[u'test@example.com'],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -107,7 +107,7 @@ class test_attr(Declarative):
                     gidnumber=[fuzzy_digits],
                     mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -132,7 +132,7 @@ class test_attr(Declarative):
                     mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'410-555-1212', u'301-555-1212'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -157,7 +157,7 @@ class test_attr(Declarative):
                     mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'301-555-1212'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -182,7 +182,7 @@ class test_attr(Declarative):
                     mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -225,7 +225,7 @@ class test_attr(Declarative):
                     mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -250,7 +250,7 @@ class test_attr(Declarative):
                     mail=[u'test@example.com', u'test2@example.com'],
                     memberof_group=[u'ipausers'],
                     telephonenumber=[u'301-555-1212', u'202-888-9833', u'703-555-1212'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
diff --git a/tests/test_xmlrpc/test_replace.py b/tests/test_xmlrpc/test_replace.py
index 931e487fa..668177844 100644
--- a/tests/test_xmlrpc/test_replace.py
+++ b/tests/test_xmlrpc/test_replace.py
@@ -89,7 +89,7 @@ class test_replace(Declarative):
                     gidnumber=[fuzzy_digits],
                     mail=[u'test1@example.com', u'test3@example.com'],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -113,7 +113,7 @@ class test_replace(Declarative):
                     gidnumber=[fuzzy_digits],
                     mail=[u'test4@example.com'],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -137,7 +137,7 @@ class test_replace(Declarative):
                     gidnumber=[fuzzy_digits],
                     mail=[u'test6@example.com', u'test7@example.com', u'test5@example.com'],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -160,7 +160,7 @@ class test_replace(Declarative):
                     uidnumber=[fuzzy_digits],
                     gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -184,7 +184,7 @@ class test_replace(Declarative):
                     gidnumber=[fuzzy_digits],
                     initials=[u'ABC'],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -207,7 +207,7 @@ class test_replace(Declarative):
                     uidnumber=[fuzzy_digits],
                     gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py
index 9ebf844d5..36e19defc 100644
--- a/tests/test_xmlrpc/test_user_plugin.py
+++ b/tests/test_xmlrpc/test_user_plugin.py
@@ -129,7 +129,7 @@ class test_user(Declarative):
                     uidnumber=[fuzzy_digits],
                     gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 value=user1,
                 summary=None,
@@ -161,7 +161,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'],
+                        'nsaccountlock': False,
                         'displayname': [u'Test User1'],
                         'cn': [u'Test User1'],
                         'initials': [u'TU'],
@@ -187,7 +187,7 @@ class test_user(Declarative):
                         loginshell=[u'/bin/sh'],
                         sn=[u'User1'],
                         uid=[user1],
-                        nsaccountlock=[u'False'],
+                        nsaccountlock=False,
                         uidnumber=[fuzzy_digits],
                         gidnumber=[fuzzy_digits],
                     ),
@@ -212,7 +212,7 @@ class test_user(Declarative):
                         loginshell=[u'/bin/bash'],
                         sn=[u'Administrator'],
                         uid=[u'admin'],
-                        nsaccountlock=[u'False'],
+                        nsaccountlock=False,
                         uidnumber=[fuzzy_digits],
                         gidnumber=[fuzzy_digits],
                     ),
@@ -223,7 +223,7 @@ class test_user(Declarative):
                         loginshell=[u'/bin/sh'],
                         sn=[u'User1'],
                         uid=[user1],
-                        nsaccountlock=[u'False'],
+                        nsaccountlock=False,
                         uidnumber=[fuzzy_digits],
                         gidnumber=[fuzzy_digits],
                     ),
@@ -248,7 +248,7 @@ class test_user(Declarative):
                         loginshell=[u'/bin/bash'],
                         sn=[u'Administrator'],
                         uid=[u'admin'],
-                        nsaccountlock=[u'False'],
+                        nsaccountlock=False,
                         uidnumber=[fuzzy_digits],
                         gidnumber=[fuzzy_digits],
                     ),
@@ -301,7 +301,7 @@ class test_user(Declarative):
                     uidnumber=[fuzzy_digits],
                     gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "tuser1"',
                 value=user1,
@@ -332,7 +332,7 @@ class test_user(Declarative):
                     uidnumber=[fuzzy_digits],
                     gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=None,
                 value=user1,
@@ -354,7 +354,7 @@ class test_user(Declarative):
                     uidnumber=[fuzzy_digits],
                     gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "%s"' % user1,
                 value=user1,
@@ -382,7 +382,7 @@ class test_user(Declarative):
                     uidnumber=[fuzzy_digits],
                     gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                 ),
                 summary=u'Modified user "%s"' % renameduser1,
                 value=renameduser1,
@@ -497,7 +497,7 @@ class test_user(Declarative):
                     uidnumber=[fuzzy_digits],
                     gidnumber=[fuzzy_digits],
                     memberof_group=[u'ipausers'],
-                    nsaccountlock=[u'False'],
+                    nsaccountlock=False,
                     manager=[user1],
                 ),
                 summary=u'Modified user "%s"' % user2,