Configure journald to retain logs for 3 days

deploy-chatmail/src/deploy_chatmail/__init__.py

@@ -292,6 +292,22 @@ def deploy_chatmail(mail_domain: str, mail_server: str, dkim_selector: str) -> N
         commands=[f"echo {mail_domain} >/etc/mailname; chmod 644 /etc/mailname"],
     )
 
+    journald_conf = files.put(
+        name="Configure journald",
+        src=importlib.resources.files(__package__).joinpath("journald.conf"),
+        dest="/etc/systemd/journald.conf",
+        user="root",
+        group="root",
+        mode="644",
+    )
+    systemd.service(
+        name="Start and enable journald",
+        service="systemd-journald.service",
+        running=True,
+        enabled=True,
+        restarted=journald_conf,
+    )
+
     def callback():
         result = server.shell(
             commands=[

deploy-chatmail/src/deploy_chatmail/journald.conf

@@ -0,0 +1,2 @@
+[Journal]
+MaxRetentionSec=3d

online-tests/benchmark.py

@@ -1,60 +1,34 @@
-def test_tls_imap(benchmark, imap):
+def test_tls_serialized_connect(benchmark, imap_or_smtp):
-    def imap_connect():
+    def connect():
-        imap.connect()
+        imap_or_smtp.connect()
 
-    benchmark(imap_connect, 10)
+    benchmark(connect)
 
 
-def test_login_imap(benchmark, imap, gencreds):
+def test_login(benchmark, imap_or_smtp, gencreds):
-    def imap_connect_and_login():
+    cls = imap_or_smtp.__class__
-        imap.connect()
+    conns = []
-        imap.login(*gencreds())
+    for i in range(20):
+        conn = cls(imap_or_smtp.host)
+        conn.connect()
+        conns.append(conn)
 
-    benchmark(imap_connect_and_login, 10)
+    def login():
+        conn = conns.pop()
+        conn.login(*gencreds())
+
+    benchmark(login)
 
 
-def test_tls_smtp(benchmark, smtp):
+def test_send_and_receive_10(benchmark, cmfactory, lp):
-    def smtp_connect():
+    """send many messages between two accounts"""
-        smtp.connect()
+    ac1, ac2 = cmfactory.get_online_accounts(2)
+    chat = cmfactory.get_accepted_chat(ac1, ac2)
 
-    benchmark(smtp_connect, 10)
+    def send_10_receive_all():
+        for i in range(10):
+            chat.send_text(f"hello {i}")
+        for i in range(10):
+            ac2.wait_next_incoming_message()
 
-
+    benchmark(send_10_receive_all)
-def test_login_smtp(benchmark, smtp, gencreds):
-    def smtp_connect_and_login():
-        smtp.connect()
-        smtp.login(*gencreds())
-
-    benchmark(smtp_connect_and_login, 10)
-
-
-class TestDC:
-    def test_autoconfigure(self, benchmark, cmfactory):
-        def autoconfig_and_idle_ready():
-            cmfactory.get_online_accounts(1)
-
-        benchmark(autoconfig_and_idle_ready, 5)
-
-    def test_ping_pong(self, benchmark, cmfactory):
-        ac1, ac2 = cmfactory.get_online_accounts(2)
-        chat = cmfactory.get_accepted_chat(ac1, ac2)
-
-        def ping_pong():
-            chat.send_text("ping")
-            msg = ac2.wait_next_incoming_message()
-            msg.chat.send_text("pong")
-            ac1.wait_next_incoming_message()
-
-        benchmark(ping_pong, 3)
-
-    def test_send_10_receive_10(self, benchmark, cmfactory, lp):
-        ac1, ac2 = cmfactory.get_online_accounts(2)
-        chat = cmfactory.get_accepted_chat(ac1, ac2)
-
-        def send_10_receive_10():
-            for i in range(10):
-                chat.send_text(f"hello {i}")
-            for i in range(10):
-                ac2.wait_next_incoming_message()
-
-        benchmark(send_10_receive_10, 1)

online-tests/conftest.py

@@ -1,6 +1,5 @@
 import os
 import io
-import time
 import random
 import subprocess
 import imaplib
@@ -15,10 +14,6 @@ def pytest_addoption(parser):
     )
 
 
-def pytest_configure(config):
-    config._benchresults = {}
-
-
 def pytest_runtest_setup(item):
     markers = list(item.iter_markers(name="slow"))
     if markers:
@@ -59,35 +54,6 @@ def pytest_report_header():
         return ["-" * len(text), text, "-" * len(text)]
 
 
-@pytest.fixture
-def benchmark(request):
-    def bench(func, num, name=None):
-        if name is None:
-            name = func.__name__
-        durations = []
-        for i in range(num):
-            now = time.time()
-            func()
-            durations.append(time.time() - now)
-        durations.sort()
-        request.config._benchresults[name] = durations
-
-    return bench
-
-
-def pytest_terminal_summary(terminalreporter):
-    tr = terminalreporter
-    results = tr.config._benchresults
-    tr.section("benchmark results")
-    headers = f"{'benchmark name': <30} {'median': >6}"
-    tr.write_line(headers)
-    tr.write_line("-" * len(headers))
-    for name, durations in results.items():
-        median = sorted(durations)[len(durations) // 2]
-        median = f"{median:2.4f}"
-        tr.write_line(f"{name: <30} {median: >6}")
-
-
 @pytest.fixture
 def imap(maildomain):
     return ImapConn(maildomain)

scripts/init.sh

@@ -11,4 +11,4 @@ chatmaild/venv/bin/pip install --upgrade pytest build 'setuptools>=68'
 chatmaild/venv/bin/pip install -e chatmaild
 
 python3 -m venv online-tests/venv
-online-tests/venv/bin/pip install pytest pytest-timeout pdbpp deltachat 
+online-tests/venv/bin/pip install pytest pytest-timeout pdbpp deltachat pytest-benchmark