Implement E2E tests for lacre.daemon

- Add a dedicated configuration file for lacre.daemon.

- Implement test/daemon_test.py like test/e2e_test.py, to automate the
following procedure:

    1. Start up lacre.daemon.
    2. For each test case, send test message to the daemon and verify that the
       output received by test/utils/relay.py contains expected pattern.

- Simplify Makefile.

- Fix indentation here and there.

Makefile

@@ -46,9 +46,7 @@ $(TEST_DB):
 # Run an e2e test of Advanced Content Filter.
 #
 daemontest:
-	$(PYTHON) test/relay.py 2500
-	PYTHONPATH=`pwd` $(PYTHON) -m lacre.daemon
-	$(PYTHON) test/sendmail.py
+	$(PYTHON) test/daemon_test.py
 
 # Before running the crontest goal we need to make sure that the
 # database gets regenerated.

test/daemon_test.py

@@ -17,15 +17,99 @@
 # along with gpg-mailgate source code. If not, see <http://www.gnu.org/licenses/>.
 #
 
+import configparser
 import logging
+import subprocess
+import os
+import time
+
+
+def _spawn(cmd):
+    env_dict = {
+        "PATH": os.getenv("PATH"),
+        "PYTHONPATH": os.getcwd(),
+        "GPG_MAILGATE_CONFIG": "test/gpg-mailgate-daemon-test.conf"
+        }
+    logging.debug(f"Spawning command: {cmd} with environment: {env_dict!r}")
+    return subprocess.Popen(cmd,
+                            stdin=None,
+                            stdout=subprocess.PIPE,
+                            env=env_dict)
+
+
+def _interrupt(proc):
+    # proc.send_signal(signal.SIGINT)
+    proc.terminate()
+
+
+def _load(name):
+    logging.debug(f"Loading file {name}")
+    f = open(name, "r")
+    contents = f.read()
+    f.close()
+    return contents
+
+
+def _send(host, port, mail_from, mail_to, message):
+    logging.debug(f"Sending message to {host}:{port}")
+    _spawn([os.getenv("PYTHON") or "python",
+            "test/utils/sendmail.py",
+            "-f", mail_from,
+            "-t", mail_to,
+            "-m", message])
+
+
+def _load_test_config():
+    cp = configparser.ConfigParser()
+    cp.read("test/e2e.ini")
+    return cp
+
+
+def _report_result(message_file, expected, test_output):
+    status = None
+    if expected in test_output:
+        status = "Success"
+    else:
+        status = "Failure"
+
+    print(message_file.ljust(30), status)
+
+
+def _execute_case(config, case_name):
+    logging.info(f"Executing case {case_name}")
+    python = os.getenv("PYTHON", "python")
+
+    relay_mock = _spawn([python, "test/utils/relay.py", "2500"])
+    time.sleep(1)                            # Wait for the relay to start up.
+
+    _send("localhost", 10025, "dave@disposlab", "alice@disposlab", "test/msgin/clear2rsa.msg")
+
+    relay_mock.wait()
+    (test_out, _) = relay_mock.communicate()
+
+    test_out = test_out.decode('utf-8')
+    logging.debug(f"Read {len(test_out)} characters of output: '{test_out}'")
+
+    _report_result(config.get(case_name, "in"), config.get(case_name, "out"), test_out)
 
 
 def _main():
+    conf = _load_test_config()
+
     logging.basicConfig(filename="test/logs/daemon-test.log",
                         format="%(asctime)s %(pathname)s:%(lineno)d %(levelname)s [%(funcName)s] %(message)s",
                         datefmt="%Y-%m-%d %H:%M:%S",
                         level=logging.DEBUG)
+
     logging.info("Starting Lacre Daemon tests...")
+    python = os.getenv("PYTHON", "python")
+
+    server = _spawn([python, "-m", "lacre.daemon"])
+
+    for case_no in range(1, conf.getint("tests", "cases")):
+        _execute_case(conf, case_name=f"case-{case_no}")
+
+    _interrupt(server)
 
 
 if __name__ == '__main__':

test/gpg-mailgate-daemon-test.conf

@@ -0,0 +1,31 @@
+[logging]
+config = test/gpg-lacre-log.ini
+file = test/logs/gpg-mailgate.log
+format = %(asctime)s %(module)s[%(process)d]: %(message)s
+date_format = ISO
+
+[gpg]
+keyhome = test/keyhome
+
+[smime]
+cert_path = test/certs
+
+[database]
+enabled = yes
+url = sqlite:///test/lacre.db
+
+[relay]
+host = localhost
+port = 2500
+
+[daemon]
+host = localhost
+port = 10025
+
+[cron]
+send_email = no
+
+[enc_keymap]
+alice@disposlab = 1CD245308F0963D038E88357973CF4D9387C44D7
+bob@disposlab = 19CF4B47ECC9C47AFA84D4BD96F39FDA0E31BB67
+

test/utils/relay.py

@@ -63,7 +63,7 @@ def serve(port):
     receive_and_confirm(conn)                       # Ignore sender address
     receive_and_confirm(conn)                       # Ignore recipient address
 
-	data = conn.recv(BUFFER_SIZE)
+    conn.recv(BUFFER_SIZE)
     conn.sendall(provide_message())
 
     # Consume until we get <CR><LF>.<CR><LF>, the end-of-message marker.

test/utils/sendmail.py

@@ -1,27 +1,48 @@
+import logging
 import smtplib
 import sys
 import getopt
 
 
+def _load_file(name):
+    f = open(name, 'r')
+    contents = f.read()
+    f.close()
+    return contents
+
+
 def _send(host, port, from_addr, recipients, message):
+    logging.info(f"From {from_addr} to {recipients} at {host}:{port}")
+    try:
         smtp = smtplib.SMTP(host, port)
         # smtp.starttls()
-    # try:
-    # breakpoint()
-    smtp.sendmail(from_addr, recipients, message)
-    # except smtplib.SMTPDataError as e:
-    #     print(f"Couldn't deliver message.\nGot error: {e}\n")
+        return smtp.sendmail(from_addr, recipients, message)
+    except smtplib.SMTPDataError as e:
+        logging.error(f"Couldn't deliver message. Got error: {e}")
+        return None
+    except ConnectionRefusedError as e:
+        logging.exception(f"Connection refused: {e}")
+        return None
 
 
+logging.basicConfig(filename="test/logs/sendmail.log",
+                    format="%(asctime)s %(pathname)s:%(lineno)d %(levelname)s [%(funcName)s] %(message)s",
+                    datefmt="%Y-%m-%d %H:%M:%S",
+                    level=logging.DEBUG)
+
 sender = recipient = message = None
 
-for opt, value in getopt.getopt(sys.argv[1:], "f:t:m:"):
-    if opt == "f":
+opts, _ = getopt.getopt(sys.argv[1:], "f:t:m:")
+for opt, value in opts:
+    if opt == "-f":
         sender = value
-    if opt == "t":
+        logging.debug(f"Sender is {sender}")
+    if opt == "-t":
         recipient = value
-    if opt == "m":
-        message = value
+        logging.debug(f"Recipient is {recipient}")
+    if opt == "-m":
+        message = _load_file(value)
+        logging.debug(f"Message is {message}")
 
 if message is None:
     message = """\