From 3af4ffe36c5e087704ca4269d18dbb856ba225e8 Mon Sep 17 00:00:00 2001 From: s3lph <1375407-s3lph@users.noreply.gitlab.com> Date: Mon, 18 Apr 2022 22:08:17 +0200 Subject: [PATCH] full test: decrypt and print messages --- .gitlab-ci.yml | 1 - test/report.py | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36a7447..b96e205 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,7 +66,6 @@ schleuder: # Run a second time - should be idempotent and not trigger any new mails - python3 -m coverage run --rcfile=setup.cfg -m multischleuder --config test/multischleuder.yml --verbose - sleep 5 # wait for mail delivery - - cat /var/spool/mail/root - test/report.py - kill -9 ${API_DAEMON_PID} || true - /usr/sbin/postmulti -i - -p stop diff --git a/test/report.py b/test/report.py index d4270ad..43e6129 100755 --- a/test/report.py +++ b/test/report.py @@ -127,6 +127,16 @@ if msg2['Precedence'] != 'list': print(f'Expected "Precedence: list", got {msg2["Precedence"]}') exit(1) +gpg1 = subprocess.Popen(['/usr/bin/gpg2', '-d'], + stdin=msg1.get_payload()[1].get_payload(decode=True), + stdout=subprocess.PIPE, stderr=subprocess.PIPE) +gpg1o, _ = gpg2.communicate() +print(f'Key conflict message (decrypted):\n{gpg1o}') +gpg2 = subprocess.Popen(['/usr/bin/gpg2', '-d'], + stdin=msg2.get_payload()[1].get_payload(decode=True), + stdout=subprocess.PIPE, stderr=subprocess.PIPE) +gpg1o, _ = gpg2.communicate() +print(f'Admin report message (decrypted):\n{gpg2o}') # Test conflict statefile