openstack/deb-python-pyldap
Code Issues Proposed changes

[TST] Fix unittests for result3

Browse Source
This commit is contained in:
Raphaël Barrois
2013-11-12 23:36:20 +01:00
committed by Christian Heimes
parent c02bdbbede
commit 5b8236dc1c
1 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Tests/t_cext.py
View File

@@ -39,7 +39,7 @@ class TestLdapCExtension(unittest.TestCase):
# Perform a simple bind # Perform a simple bind
l.set_option(_ldap.OPT_PROTOCOL_VERSION, _ldap.VERSION3) l.set_option(_ldap.OPT_PROTOCOL_VERSION, _ldap.VERSION3)
m = l.simple_bind(server.get_root_dn(), server.get_root_password()) m = l.simple_bind(server.get_root_dn(), server.get_root_password())
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ONE, self.timeout) result, _pmsg, _msgid, _ctrls = l.result4(m, _ldap.MSG_ONE, self.timeout)
self.assertTrue(result, _ldap.RES_BIND) self.assertTrue(result, _ldap.RES_BIND)
return l return l
@@ -56,7 +56,7 @@ class TestLdapCExtension(unittest.TestCase):
self.assertEquals(_ldap.VERSION2, 2) self.assertEquals(_ldap.VERSION2, 2)
self.assertEquals(_ldap.VERSION3, 3) self.assertEquals(_ldap.VERSION3, 3)
# constants for result3() # constants for result4()
self.assertEquals(_ldap.RES_BIND, 0x61) self.assertEquals(_ldap.RES_BIND, 0x61)
self.assertEquals(_ldap.RES_SEARCH_ENTRY, 0x64) self.assertEquals(_ldap.RES_SEARCH_ENTRY, 0x64)
self.assertEquals(_ldap.RES_SEARCH_RESULT, 0x65) self.assertEquals(_ldap.RES_SEARCH_RESULT, 0x65)
@@ -84,7 +84,7 @@ class TestLdapCExtension(unittest.TestCase):
self.assertNotNone(_ldap.MOD_INCREMENT) self.assertNotNone(_ldap.MOD_INCREMENT)
self.assertNotNone(_ldap.MOD_BVALUES) self.assertNotNone(_ldap.MOD_BVALUES)
# for result3() # for result4()
self.assertNotNone(_ldap.MSG_ONE) self.assertNotNone(_ldap.MSG_ONE)
self.assertNotNone(_ldap.MSG_ALL) self.assertNotNone(_ldap.MSG_ALL)
self.assertNotNone(_ldap.MSG_RECEIVED) self.assertNotNone(_ldap.MSG_RECEIVED)
@@ -143,10 +143,6 @@ class TestLdapCExtension(unittest.TestCase):
self.assertNotNone(_ldap.AVA_BINARY) self.assertNotNone(_ldap.AVA_BINARY)
self.assertNotNone(_ldap.AVA_NONPRINTABLE) self.assertNotNone(_ldap.AVA_NONPRINTABLE)
# these two constants are pointless? XXX
self.assertEquals(_ldap.LDAP_OPT_ON, 1)
self.assertEquals(_ldap.LDAP_OPT_OFF, 0)
# these constants useless after ldap_url_parse() was dropped XXX # these constants useless after ldap_url_parse() was dropped XXX
self.assertNotNone(_ldap.URL_ERR_BADSCOPE) self.assertNotNone(_ldap.URL_ERR_BADSCOPE)
self.assertNotNone(_ldap.URL_ERR_MEM) self.assertNotNone(_ldap.URL_ERR_MEM)
@@ -157,7 +153,7 @@ class TestLdapCExtension(unittest.TestCase):
def test_simple_anonymous_bind(self): def test_simple_anonymous_bind(self):
l = self._init(bind=False) l = self._init(bind=False)
m = l.simple_bind("", "") m = l.simple_bind("", "")
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertTrue(result, _ldap.RES_BIND) self.assertTrue(result, _ldap.RES_BIND)
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(pmsg, []) self.assertEquals(pmsg, [])
@@ -165,7 +161,7 @@ class TestLdapCExtension(unittest.TestCase):
# see if we can get the rootdse while we're here # see if we can get the rootdse while we're here
m = l.search_ext("", _ldap.SCOPE_BASE, '(objectClass=*)') m = l.search_ext("", _ldap.SCOPE_BASE, '(objectClass=*)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
self.assertEquals(pmsg[0][0], "") # rootDSE has no dn self.assertEquals(pmsg[0][0], "") # rootDSE has no dn
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
@@ -185,7 +181,7 @@ class TestLdapCExtension(unittest.TestCase):
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE,
'(objectClass=dcObject)') '(objectClass=dcObject)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ONE, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ONE, self.timeout)
# Expect to get just one object # Expect to get just one object
self.assertEquals(result, _ldap.RES_SEARCH_ENTRY) self.assertEquals(result, _ldap.RES_SEARCH_ENTRY)
@@ -198,7 +194,7 @@ class TestLdapCExtension(unittest.TestCase):
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(ctrls, []) self.assertEquals(ctrls, [])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ONE, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ONE, self.timeout)
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
self.assertEquals(pmsg, []) self.assertEquals(pmsg, [])
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
@@ -214,7 +210,7 @@ class TestLdapCExtension(unittest.TestCase):
got_timeout = False got_timeout = False
try: try:
r = l.result3(m, _ldap.MSG_ALL, 0.3) # (timeout /could/ be longer) r = l.result4(m, _ldap.MSG_ALL, 0.3) # (timeout /could/ be longer)
except _ldap.TIMEOUT, e: except _ldap.TIMEOUT, e:
got_timeout = True got_timeout = True
self.assertTrue(got_timeout) self.assertTrue(got_timeout)
@@ -223,7 +219,7 @@ class TestLdapCExtension(unittest.TestCase):
l = self._init() l = self._init()
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(objectClass=*)') m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(objectClass=*)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
# Expect to get some objects # Expect to get some objects
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
@@ -240,7 +236,7 @@ class TestLdapCExtension(unittest.TestCase):
('description', 'testing'), ('description', 'testing'),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_ADD) self.assertEquals(result, _ldap.RES_ADD)
self.assertEquals(pmsg, []) self.assertEquals(pmsg, [])
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
@@ -248,7 +244,7 @@ class TestLdapCExtension(unittest.TestCase):
# search for it back # search for it back
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=Foo)') m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=Foo)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
# Expect to get the objects # Expect to get the objects
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
@@ -272,14 +268,14 @@ class TestLdapCExtension(unittest.TestCase):
('cn', 'CompareTest'), ('cn', 'CompareTest'),
('userPassword', 'the_password'), ('userPassword', 'the_password'),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_ADD) self.assertEquals(result, _ldap.RES_ADD)
# try a false compare # try a false compare
m = l.compare_ext(dn, "userPassword", "bad_string") m = l.compare_ext(dn, "userPassword", "bad_string")
compared_false = False compared_false = False
try: try:
r = l.result3(m, _ldap.MSG_ALL, self.timeout) r = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.fail(repr(r)) self.fail(repr(r))
except _ldap.COMPARE_FALSE: except _ldap.COMPARE_FALSE:
compared_false = True compared_false = True
@@ -289,7 +285,7 @@ class TestLdapCExtension(unittest.TestCase):
m = l.compare_ext(dn, "userPassword", "the_password") m = l.compare_ext(dn, "userPassword", "the_password")
compared_true = False compared_true = False
try: try:
r = l.result3(m, _ldap.MSG_ALL, self.timeout) r = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.fail(repr(r)) self.fail(repr(r))
except _ldap.COMPARE_TRUE: except _ldap.COMPARE_TRUE:
compared_true = True compared_true = True
@@ -298,7 +294,7 @@ class TestLdapCExtension(unittest.TestCase):
m = l.compare_ext(dn, "badAttribute", "ignoreme") m = l.compare_ext(dn, "badAttribute", "ignoreme")
raised_error = False raised_error = False
try: try:
r = l.result3(m, _ldap.MSG_ALL, self.timeout) r = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.fail(repr(r)) self.fail(repr(r))
except _ldap.error: except _ldap.error:
raised_error = True raised_error = True
@@ -311,7 +307,7 @@ class TestLdapCExtension(unittest.TestCase):
not_found = False not_found = False
m = l.delete_ext("cn=DoesNotExist,"+self.base) m = l.delete_ext("cn=DoesNotExist,"+self.base)
try: try:
r = l.result3(m, _ldap.MSG_ALL, self.timeout) r = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.fail(r) self.fail(r)
except _ldap.NO_SUCH_OBJECT: except _ldap.NO_SUCH_OBJECT:
not_found = True not_found = True
@@ -325,11 +321,11 @@ class TestLdapCExtension(unittest.TestCase):
('objectClass','organizationalRole'), ('objectClass','organizationalRole'),
('cn', 'Deleteme'), ('cn', 'Deleteme'),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_ADD) self.assertEquals(result, _ldap.RES_ADD)
m = l.delete_ext(dn) m = l.delete_ext(dn)
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_DELETE) self.assertEquals(result, _ldap.RES_DELETE)
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(pmsg, []) self.assertEquals(pmsg, [])
@@ -344,7 +340,7 @@ class TestLdapCExtension(unittest.TestCase):
(_ldap.MOD_ADD, 'description', ['blah']), (_ldap.MOD_ADD, 'description', ['blah']),
]) ])
try: try:
r = l.result3(m, _ldap.MSG_ALL, self.timeout) r = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.fail(r) self.fail(r)
except _ldap.NO_SUCH_OBJECT: except _ldap.NO_SUCH_OBJECT:
not_found = True not_found = True
@@ -360,7 +356,7 @@ class TestLdapCExtension(unittest.TestCase):
(_ldap.MOD_ADD, 'description', []), (_ldap.MOD_ADD, 'description', []),
]) ])
self.assertTrue(isinstance(m, int)) self.assertTrue(isinstance(m, int))
r = l.result3(m, _ldap.MSG_ALL, self.timeout) # what should happen?? r = l.result4(m, _ldap.MSG_ALL, self.timeout) # what should happen??
self.fail(r) self.fail(r)
def test_modify(self): def test_modify(self):
@@ -373,13 +369,13 @@ class TestLdapCExtension(unittest.TestCase):
('sn', 'Modify'), ('sn', 'Modify'),
('description', 'a description'), ('description', 'a description'),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_ADD) self.assertEquals(result, _ldap.RES_ADD)
m = l.modify_ext(dn, [ m = l.modify_ext(dn, [
(_ldap.MOD_ADD, 'description', ['b desc', 'c desc']), (_ldap.MOD_ADD, 'description', ['b desc', 'c desc']),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_MODIFY) self.assertEquals(result, _ldap.RES_MODIFY)
self.assertEquals(pmsg, []) self.assertEquals(pmsg, [])
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
@@ -387,7 +383,7 @@ class TestLdapCExtension(unittest.TestCase):
# search for it back # search for it back
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=AddToMe)') m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=AddToMe)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
# Expect to get the objects # Expect to get the objects
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
@@ -407,12 +403,12 @@ class TestLdapCExtension(unittest.TestCase):
('objectClass','organizationalRole'), ('objectClass','organizationalRole'),
('cn', 'RenameMe'), ('cn', 'RenameMe'),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_ADD) self.assertEquals(result, _ldap.RES_ADD)
# do the rename with same parent # do the rename with same parent
m = l.rename(dn, "cn=IAmRenamed") m = l.rename(dn, "cn=IAmRenamed")
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_MODRDN) self.assertEquals(result, _ldap.RES_MODRDN)
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(pmsg, []) self.assertEquals(pmsg, [])
@@ -420,7 +416,7 @@ class TestLdapCExtension(unittest.TestCase):
# make sure the old one is gone # make sure the old one is gone
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=RenameMe)') m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=RenameMe)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
self.assertEquals(len(pmsg), 0) # expect no results self.assertEquals(len(pmsg), 0) # expect no results
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
@@ -429,7 +425,7 @@ class TestLdapCExtension(unittest.TestCase):
# check that the new one looks right # check that the new one looks right
dn2 = "cn=IAmRenamed,"+self.base dn2 = "cn=IAmRenamed,"+self.base
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=IAmRenamed)') m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=IAmRenamed)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(ctrls, []) self.assertEquals(ctrls, [])
@@ -443,7 +439,7 @@ class TestLdapCExtension(unittest.TestCase):
('objectClass','organizationalUnit'), ('objectClass','organizationalUnit'),
('ou', 'RenameContainer'), ('ou', 'RenameContainer'),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_ADD) self.assertEquals(result, _ldap.RES_ADD)
# WORKAROUND bug in slapd. (Without an existing child, # WORKAROUND bug in slapd. (Without an existing child,
@@ -454,7 +450,7 @@ class TestLdapCExtension(unittest.TestCase):
('objectClass','organizationalRole'), ('objectClass','organizationalRole'),
('cn', 'Bogus'), ('cn', 'Bogus'),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_ADD) self.assertEquals(result, _ldap.RES_ADD)
# now rename from dn2 to the conater # now rename from dn2 to the conater
@@ -462,7 +458,7 @@ class TestLdapCExtension(unittest.TestCase):
# Now try renaming dn2 across container (simultaneous name change) # Now try renaming dn2 across container (simultaneous name change)
m = l.rename(dn2, "cn=IAmRenamedAgain", containerDn) m = l.rename(dn2, "cn=IAmRenamedAgain", containerDn)
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_MODRDN) self.assertEquals(result, _ldap.RES_MODRDN)
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(pmsg, []) self.assertEquals(pmsg, [])
@@ -470,18 +466,18 @@ class TestLdapCExtension(unittest.TestCase):
# make sure dn2 is gone # make sure dn2 is gone
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=IAmRenamed)') m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=IAmRenamed)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
self.assertEquals(len(pmsg), 0) # expect no results self.assertEquals(len(pmsg), 0) # expect no results
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(ctrls, []) self.assertEquals(ctrls, [])
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(objectClass=*)') m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(objectClass=*)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
# make sure dn3 is there # make sure dn3 is there
m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=IAmRenamedAgain)') m = l.search_ext(self.base, _ldap.SCOPE_SUBTREE, '(cn=IAmRenamedAgain)')
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_SEARCH_RESULT) self.assertEquals(result, _ldap.RES_SEARCH_RESULT)
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(ctrls, []) self.assertEquals(ctrls, [])
@@ -507,7 +503,7 @@ class TestLdapCExtension(unittest.TestCase):
# Anonymous bind # Anonymous bind
m = l.simple_bind("", "") m = l.simple_bind("", "")
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertTrue(result, _ldap.RES_BIND) self.assertTrue(result, _ldap.RES_BIND)
r = l.whoami_s() r = l.whoami_s()
@@ -524,20 +520,20 @@ class TestLdapCExtension(unittest.TestCase):
('cn', 'PasswordTest'), ('cn', 'PasswordTest'),
('userPassword', 'initial'), ('userPassword', 'initial'),
]) ])
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(result, _ldap.RES_ADD) self.assertEquals(result, _ldap.RES_ADD)
# try changing password with a wrong old-pw # try changing password with a wrong old-pw
m = l.passwd(dn, "bogus", "ignored") m = l.passwd(dn, "bogus", "ignored")
try: try:
r = l.result3(m, _ldap.MSG_ALL, self.timeout) r = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.fail("expected UNWILLING_TO_PERFORM") self.fail("expected UNWILLING_TO_PERFORM")
except _ldap.UNWILLING_TO_PERFORM: except _ldap.UNWILLING_TO_PERFORM:
pass pass
# try changing password with a correct old-pw # try changing password with a correct old-pw
m = l.passwd(dn, "initial", "changed") m = l.passwd(dn, "initial", "changed")
result,pmsg,msgid,ctrls = l.result3(m, _ldap.MSG_ALL, self.timeout) result,pmsg,msgid,ctrls = l.result4(m, _ldap.MSG_ALL, self.timeout)
self.assertEquals(msgid, m) self.assertEquals(msgid, m)
self.assertEquals(pmsg, []) self.assertEquals(pmsg, [])
self.assertEquals(result, _ldap.RES_EXTENDED) self.assertEquals(result, _ldap.RES_EXTENDED)