Compare commits

..

No commits in common. "ee2822e46f23ab6cade1c21f69b123a80cac3c3b" and "e068298d3c6b7c191d79eebd0791c6221e4168bb" have entirely different histories.

4 changed files with 6 additions and 9 deletions

View file

@ -11,7 +11,7 @@ conf_file = f'{environ["MACHINE_TEST_DIR"]}/imap.yml'
with open(conf_file) as yaml: with open(conf_file) as yaml:
data = load(yaml, Loader=SafeLoader) data = load(yaml, Loader=SafeLoader)
parameters = (('user', data['username'], data['password']), parameters = (('user', data['username'], data['password']),
('family', data['username_family'], data['password_family'] + "2"), ('family', data['username_family'], data['password_family']),
) )

View file

@ -2,5 +2,5 @@ format: '0.1'
description: Mariadb description: Mariadb
depends: depends:
- server - server
- base-fedora-36 - base-fedora-35
provider: MariaDB provider: MariaDB

View file

@ -2,5 +2,5 @@ format: '0.1'
description: OpenLDAP server description: OpenLDAP server
depends: depends:
- ldap-client-fedora - ldap-client-fedora
- base-fedora-36 - base-fedora-35
provider: LDAP provider: LDAP

View file

@ -70,16 +70,13 @@ def test_ldap_user():
l.simple_bind_s(data['user_dn'], data['user_password']) l.simple_bind_s(data['user_dn'], data['user_password'])
def test_ldap_migration(): def test_ldap_user_family():
conf_file = f'{environ["MACHINE_TEST_DIR"]}/openldap.yml' conf_file = f'{environ["MACHINE_TEST_DIR"]}/openldap.yml'
with open(conf_file) as yaml: with open(conf_file) as yaml:
data = load(yaml, Loader=SafeLoader) data = load(yaml, Loader=SafeLoader)
set_option(OPT_X_TLS_REQUIRE_CERT, OPT_X_TLS_NEVER) set_option(OPT_X_TLS_REQUIRE_CERT, OPT_X_TLS_NEVER)
l = initialize(f'ldaps://{data["address"]}') l = initialize(f'ldaps://{data["address"]}')
if 'FIRST_RUN' in environ: l.simple_bind_s(data['user_family_dn'], data['user_family_password'])
l.simple_bind_s(data['admin_dn'], data['admin_password'])
l.passwd_s(data['user_family_dn'], data['user_family_password'], data['user_family_password'] + "2")
l.simple_bind_s(data['user_family_dn'], data['user_family_password'] + "2")
def test_ldap_remote_auth(): def test_ldap_remote_auth():