diff --git a/.github/workflows/test-and-deploy.yaml b/.github/workflows/test-and-deploy.yaml index 76fddd85..b261d174 100644 --- a/.github/workflows/test-and-deploy.yaml +++ b/.github/workflows/test-and-deploy.yaml @@ -79,7 +79,7 @@ jobs: ssh root@ns.testrun.org systemctl reload nsd - name: cmdeploy test - run: sleep 60; CHATMAIL_DOMAIN2=nine.testrun.org cmdeploy test --slow + run: CHATMAIL_DOMAIN2=nine.testrun.org cmdeploy test --slow - name: cmdeploy dns (try 3 times) run: cmdeploy dns || cmdeploy dns || cmdeploy dns diff --git a/cmdeploy/src/cmdeploy/tests/online/test_0_login.py b/cmdeploy/src/cmdeploy/tests/online/test_0_login.py index 0b7a861d..866973bc 100644 --- a/cmdeploy/src/cmdeploy/tests/online/test_0_login.py +++ b/cmdeploy/src/cmdeploy/tests/online/test_0_login.py @@ -2,6 +2,7 @@ import pytest import threading import queue import socket +import time from chatmaild.config import read_config from cmdeploy.cmdeploy import main @@ -81,7 +82,14 @@ def test_concurrent_logins_same_account( assert login_results.get() -def test_no_vrfy(chatmail_config): +def test_no_vrfy(chatmail_config, remote): + found = False + while not found: + for line in remote.iter_output(logcmd="journalctl -u echobot"): + print(line) + if "successfully logged into imap server" in line: + found = True + break sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((chatmail_config.mail_domain, 25)) banner = sock.recv(1024)