git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 58173f2)
s4:dsdb/tests: let password_lockout.py make the LDAP error string checks more useful
authorStefan Metzmacher <metze@samba.org>
Fri, 5 Feb 2016 07:37:53 +0000 (08:37 +0100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 30 Jun 2016 01:30:25 +0000 (03:30 +0200)
We should first check if the error number is as expected and
then check for a specific WERROR in the error string.

We also add the full error string as msg to assertTrue(),
so we'll actually see it if the assertion is wrong.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
source4/dsdb/tests/python/password_lockout.py patch | blob | history

diff --git a/source4/dsdb/tests/python/password_lockout.py b/source4/dsdb/tests/python/password_lockout.py
index 430431cf60dee88d16de1aadbeeb53412e27f584..7cb0dc60ff42b42c933f386ab00e3ac19860f2c0 100755 (executable)
--- a/source4/dsdb/tests/python/password_lockout.py
+++ b/source4/dsdb/tests/python/password_lockout.py
@@ -425,7 +425,7 @@ userPassword: thatsAcomplPASS2
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
             # Windows (2008 at least) seems to have some small bug here: it
             # returns "0000056A" on longer (always wrong) previous passwords.
-            self.assertTrue('00000056' in msg)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=1,
@@ -529,7 +529,7 @@ userPassword: thatsAcomplPASS2
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
             # Windows (2008 at least) seems to have some small bug here: it
             # returns "0000056A" on longer (always wrong) previous passwords.
-            self.assertTrue('00000056' in msg)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser3,cn=users," + self.base_dn,
                                   badPwdCount=1,
@@ -627,8 +627,8 @@ userPassword: thatsAcomplPASS2
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=1,
@@ -671,8 +671,8 @@ userPassword: thatsAcomplPASS2
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=2,
@@ -698,8 +698,8 @@ userPassword: thatsAcomplPASS2
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -726,7 +726,7 @@ userPassword: thatsAcomplPASS2
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('00000775' in msg)
+            self.assertTrue('00000775' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -751,7 +751,7 @@ userPassword: thatsAcomplPASS2
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('00000775' in msg)
+            self.assertTrue('00000775' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -776,7 +776,7 @@ userPassword: thatsAcomplPASS2x
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('0000775' in msg)
+            self.assertTrue('00000775' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -819,7 +819,7 @@ userPassword: thatsAcomplPASS2x
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('0000775' in msg)
+            self.assertTrue('00000775' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -864,7 +864,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2x\"".encode('utf-16-le'))
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('0000775' in msg)
+            self.assertTrue('00000775' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -923,7 +923,7 @@ userPassword: thatsAcomplPASS2XYZ
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('00000056' in msg)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=1,
@@ -949,7 +949,7 @@ userPassword: thatsAcomplPASS2XYZ
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('00000056' in msg)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=2,
@@ -1012,8 +1012,8 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=1,
@@ -1056,8 +1056,8 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=2,
@@ -1097,8 +1097,8 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         # this is strange, why do we have lockoutTime=badPasswordTime here?
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
@@ -1126,7 +1126,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('00000775' in msg)
+            self.assertTrue('00000775' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -1151,7 +1151,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('00000775' in msg)
+            self.assertTrue('00000775' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -1176,7 +1176,7 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2x\"".encode('utf-16-le'))
             self.fail()
         except LdbError, (num, msg):
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
-            self.assertTrue('0000775' in msg)
+            self.assertTrue('00000775' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
@@ -1233,8 +1233,8 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=1,
@@ -1259,8 +1259,8 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=2,
@@ -1299,8 +1299,8 @@ unicodePwd:: """ + base64.b64encode("\"thatsAcomplPASS2\"".encode('utf-16-le'))
 """)
             self.fail()
         except LdbError, (num, msg):
-            self.assertTrue('00000056' in msg)
             self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
+            self.assertTrue('00000056' in msg, msg)
 
         res = self._check_account("cn=testuser,cn=users," + self.base_dn,
                                   badPwdCount=3,
Samba Shared Repository