more maildata shifting

This commit is contained in:
holger krekel
2023-10-21 00:47:19 +02:00
parent dd232689a7
commit 7dd2d0b9b4
3 changed files with 29 additions and 33 deletions

View File

@@ -20,7 +20,7 @@ def test_use_two_chatmailservers(cmfactory, maildomain2):
@pytest.mark.parametrize("forgeaddr", ["internal", "someone@example.org"])
def test_reject_forged_from(cmsetup, mailgen, lp, forgeaddr):
def test_reject_forged_from(cmsetup, get_mail_data, lp, forgeaddr):
user1, user3 = cmsetup.gen_users(2)
lp.sec("send encrypted message with forged from")
@@ -31,7 +31,8 @@ def test_reject_forged_from(cmsetup, mailgen, lp, forgeaddr):
addr_to_forge = "someone@example.org"
print("message to inject:")
msg = mailgen.get_encrypted(from_addr=addr_to_forge, to_addr=user3.addr)
msg = get_mail_data("encrypted.eml", from_addr=addr_to_forge, to_addr=user3.addr)
msg = msg.as_string()
for line in msg.split("\n")[:4]:
print(f" {line}")
@@ -42,10 +43,10 @@ def test_reject_forged_from(cmsetup, mailgen, lp, forgeaddr):
@pytest.mark.slow
def test_exceed_rate_limit(cmsetup, gencreds, mailgen):
def test_exceed_rate_limit(cmsetup, gencreds, get_mail_data):
"""Test that the per-account send-mail limit is exceeded."""
user1, user2 = cmsetup.gen_users(2)
mail = mailgen.get_encrypted(user1.addr, user2.addr)
mail = get_mail_data("encrypted", from_addr=user1.addr, to_addr=user2.addr)
for i in range(100):
print("Sending mail", str(i))
try: