ldap in fedora 36

seed/dovecot/tests/test_imap.py

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

seed/mariadb/applicationservice.yml

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

seed/openldap/applicationservice.yml

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

seed/openldap/tests/test_openldap.py

@@ -23,7 +23,7 @@ def test_ldap_admin():
     l.simple_bind_s(data['admin_dn'], data['admin_password'])
 
     assert l.search_s(data['base_account_dn'], SCOPE_SUBTREE,'(objectClass=inetOrgPerson)',['cn'])
-
+    
 
 def test_ldap_accounts():
     conf_file = f'{environ["MACHINE_TEST_DIR"]}/openldap.yml'
@@ -70,13 +70,16 @@ def test_ldap_user():
     l.simple_bind_s(data['user_dn'], data['user_password'])
 
 
-def test_ldap_user_family():
+def test_ldap_migration():
     conf_file = f'{environ["MACHINE_TEST_DIR"]}/openldap.yml'
     with open(conf_file) as yaml:
         data = load(yaml, Loader=SafeLoader)
     set_option(OPT_X_TLS_REQUIRE_CERT, OPT_X_TLS_NEVER)
     l = initialize(f'ldaps://{data["address"]}')
-    l.simple_bind_s(data['user_family_dn'], data['user_family_password'])
+    if 'FIRST_RUN' in environ:
+        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():