diff --git a/tests/internal.nix b/tests/internal.nix index 93441b0..251efbc 100644 --- a/tests/internal.nix +++ b/tests/internal.nix @@ -199,8 +199,8 @@ in with subtest("Check dovecot maildir and index locations"): # If these paths change we need a migration - machine.succeed("doveadm user -f home user1@example.com | grep ${nodes.machine.config.mailserver.mailDirectory}/example.com/user1") - machine.succeed("doveadm user -f mail user1@example.com | grep 'maildir:~/mail:INDEX=${nodes.machine.config.mailserver.indexDir}/example.com/user1'") + machine.succeed("doveadm user -f home user1@example.com | grep ${nodes.machine.mailserver.mailDirectory}/example.com/user1") + machine.succeed("doveadm user -f mail user1@example.com | grep 'maildir:~/mail:INDEX=${nodes.machine.mailserver.indexDir}/example.com/user1'") with subtest("mail to send only accounts is rejected"): machine.wait_for_open_port(25) diff --git a/tests/ldap.nix b/tests/ldap.nix index 0948357..dfc8599 100644 --- a/tests/ldap.nix +++ b/tests/ldap.nix @@ -225,7 +225,7 @@ in with subtest("Check dovecot mail and index locations"): # If these paths change we need a migration - machine.succeed("doveadm user -f home bob@example.com | grep ${nodes.machine.config.mailserver.mailDirectory}/ldap/bob@example.com") - machine.succeed("doveadm user -f mail bob@example.com | grep 'maildir:~/mail:INDEX=${nodes.machine.config.mailserver.indexDir}/ldap/bob@example.com'") + machine.succeed("doveadm user -f home bob@example.com | grep ${nodes.machine.mailserver.mailDirectory}/ldap/bob@example.com") + machine.succeed("doveadm user -f mail bob@example.com | grep 'maildir:~/mail:INDEX=${nodes.machine.mailserver.indexDir}/ldap/bob@example.com'") ''; }