fix capturing of logging to capture postfix better

online-tests/conftest.py

@@ -61,7 +61,8 @@ def imap(maildomain):
 
 class ImapConn:
     AuthError = imaplib.IMAP4.error
-    logunit = "dovecot"
+    logcmd = "journalctl -f -u dovecot"
+    name = "dovecot"
 
     def __init__(self, host):
         self.host = host
@@ -82,7 +83,8 @@ def smtp(maildomain):
 
 class SmtpConn:
     AuthError = smtplib.SMTPAuthenticationError
-    logunit = "postfix"
+    logcmd = "journalctl -f -t postfix/smtpd -t postfix/smtp -t postfix/lmtp"
+    name = "postfix"
 
     def __init__(self, host):
         self.host = host
@@ -188,8 +190,8 @@ class RemoteLog:
     def __init__(self, sshdomain):
         self.sshdomain = sshdomain
 
-    def iter(self, unit=""):
-        getjournal = f"journalctl -f -u {unit}" if unit else "journalctl -f"
+    def iter(self, logcmd=""):
+        getjournal = f"journalctl -f" if not logcmd else logcmd
         self.popen = subprocess.Popen(
             ["ssh", f"root@{self.sshdomain}", getjournal],
             stdout=subprocess.PIPE,

online-tests/test_0_basic.py

@@ -1,7 +1,7 @@
 def test_remotelog(remotelog, imap_or_smtp):
-    lineproducer = remotelog.iter(imap_or_smtp.logunit)
+    lineproducer = remotelog.iter(imap_or_smtp.logcmd)
     imap_or_smtp.connect()
-    assert imap_or_smtp.logunit in next(lineproducer)
+    assert imap_or_smtp.name in next(lineproducer)
 
 
 def test_use_two_chatmailservers(cmfactory, maildomain2):

online-tests/test_1_deltachat.py

@@ -48,7 +48,7 @@ class TestEndToEndDeltaChat:
 
         addr = ac2.get_config("addr").lower()
         saved_ok = 0
-        for line in remotelog.iter("dovecot"):
+        for line in remotelog.iter("journalctl -f -u dovecot"):
             if addr not in line:
                 # print(line)
                 continue