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>
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.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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=1,
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.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,
res = self._check_account("cn=testuser3,cn=users," + self.base_dn,
badPwdCount=1,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=1,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=2,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=1,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=2,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=1,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=2,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
# this is strange, why do we have lockoutTime=badPasswordTime here?
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
self.fail()
except LdbError, (num, msg):
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=1,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=2,
""")
self.fail()
except LdbError, (num, msg):
""")
self.fail()
except LdbError, (num, msg):
- self.assertTrue('00000056' in msg)
self.assertEquals(num, ERR_CONSTRAINT_VIOLATION)
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,
res = self._check_account("cn=testuser,cn=users," + self.base_dn,
badPwdCount=3,