nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

users: Avoid test error if ldapsearch is not available

Browse Source 
ldapsearch is provided by ldap-utils, which is not a build dependency.

Test: Build package using `gbp buildpackage`.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
James Valleroy 2021-01-05 19:13:29 -05:00 committed by Veiko Aasa
parent 7cf166e558
commit d69a36c25f
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plinth/modules/users/tests/test_actions.py
View File

@ -24,10 +24,13 @@ _cleanup_groups = None
def _is_ldap_set_up(): def _is_ldap_set_up():
"""Return whether LDAP is set up.""" """Return whether LDAP is set up."""
return subprocess.call([ try:
'ldapsearch', '-Y', 'EXTERNAL', '-H', 'ldapi:///', '-b', return subprocess.call([
'ou=groups,dc=thisbox' 'ldapsearch', '-Y', 'EXTERNAL', '-H', 'ldapi:///', '-b',
]) == 0 'ou=groups,dc=thisbox'
]) == 0
except FileNotFoundError:
return False
pytestmark = [ pytestmark = [