diff --git a/cmdeploy/src/cmdeploy/tests/online/test_0_qr.py b/cmdeploy/src/cmdeploy/tests/online/test_0_qr.py index e3b662e2..1417ccf0 100644 --- a/cmdeploy/src/cmdeploy/tests/online/test_0_qr.py +++ b/cmdeploy/src/cmdeploy/tests/online/test_0_qr.py @@ -9,7 +9,7 @@ def test_gen_qr_png_data(maildomain): def test_fastcgi_working(maildomain, chatmail_config): - url = f"https://{maildomain}/cgi-bin/newemail.py" + url = f"https://{maildomain}/new" print(url) res = requests.post(url) assert maildomain in res.json().get("email") @@ -18,7 +18,7 @@ def test_fastcgi_working(maildomain, chatmail_config): def test_newemail_configure(maildomain, rpc): """Test configuring accounts by scanning a QR code works.""" - url = f"DCACCOUNT:https://{maildomain}/cgi-bin/newemail.py" + url = f"DCACCOUNT:https://{maildomain}/new" for i in range(3): account_id = rpc.add_account() rpc.set_config_from_qr(account_id, url) diff --git a/cmdeploy/src/cmdeploy/tests/online/test_1_basic.py b/cmdeploy/src/cmdeploy/tests/online/test_1_basic.py index 316e933a..1ee08e73 100644 --- a/cmdeploy/src/cmdeploy/tests/online/test_1_basic.py +++ b/cmdeploy/src/cmdeploy/tests/online/test_1_basic.py @@ -48,7 +48,7 @@ def test_reject_missing_dkim(cmsetup, maildata, from_addr): recipient = cmsetup.gen_users(1)[0] msg = maildata("plain.eml", from_addr=from_addr, to_addr=recipient.addr).as_string() with smtplib.SMTP(cmsetup.maildomain, 25) as s: - with pytest.raises(smtplib.SMTPDataError, match="Spam message rejected"): + with pytest.raises(smtplib.SMTPDataError, match="missing DKIM signature"): s.sendmail(from_addr=from_addr, to_addrs=recipient.addr, msg=msg)