Skip to content

Commit

Permalink
Remove filterstr workaround from syncrpl test
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Heimes authored and Petr Viktorin committed Jan 16, 2018
1 parent 1266c65 commit 7d69bbd
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions Tests/t_ldap_syncrepl.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ class SyncreplClient(SimpleLDAPObject, SyncreplConsumer):
search, it can't be used for anything else.
"""

def __init__(self, uri, dn, password, storage=None, filterstr=None,
**kwargs):
def __init__(self, uri, dn, password, storage=None, **kwargs):
"""
Set up our object by creating a search client, connecting, and binding.
"""
Expand All @@ -152,7 +151,6 @@ def __init__(self, uri, dn, password, storage=None, filterstr=None,
self.data['cookie'] = None
self.present = []
self.refresh_done = False
self.filterstr = filterstr

SimpleLDAPObject.__init__(self, uri, **kwargs)
self.simple_bind_s(dn, password)
Expand All @@ -175,7 +173,6 @@ def search(self, search_base, search_mode):
search_base,
ldap.SCOPE_SUBTREE,
mode=search_mode,
filterstr=self.filterstr
)

def cancel(self):
Expand Down Expand Up @@ -431,7 +428,6 @@ def setUp(self):
self.server.ldap_uri,
self.server.root_dn,
self.server.root_pw,
filterstr=u'(objectClass=*)',
bytes_mode=False
)
self.suffix = self.server.suffix
Expand All @@ -445,7 +441,6 @@ def setUp(self):
self.server.ldap_uri,
self.server.root_dn.encode('utf-8'),
self.server.root_pw.encode('utf-8'),
filterstr=b'(objectClass=*)',
bytes_mode=True
)
self.suffix = self.server.suffix.encode('utf-8')
Expand Down

0 comments on commit 7d69bbd

Please sign in to comment.