From b7c722942c51252f2a27922fc9980aa0cc66175a Mon Sep 17 00:00:00 2001
From: Nicolas KAROLAK <nicolas@karolak.fr>
Date: Tue, 7 May 2019 11:05:54 +0200
Subject: [PATCH] handle EMAIL_SMTP_SERVER host:port notation
---
tests/test_email.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/tests/test_email.py b/tests/test_email.py
index f5383a02..97284414 100755
--- a/tests/test_email.py
+++ b/tests/test_email.py
@@ -210,9 +210,14 @@ def main():
# get settings
conf = u.load_conf()
- relay = conf.get("EMAIL_SMTP_SERVER", "").replace("[", "").replace("]", "")
+ relay_host = (
+ conf.get("EMAIL_SMTP_SERVER", "")
+ .replace("[", "")
+ .replace("]", "")
+ .split(":")[0]
+ )
ip_addr = (
- (socket.gethostbyname(relay) if relay else None)
+ (socket.gethostbyname(relay_host) if relay_host else None)
or conf.get("NETWORK_IP_NAT")
or conf.get("NETWORK_IP")
or u.get_ip()
@@ -230,7 +235,7 @@ def main():
errors += check_err if check_err else errors
# check that relayhost is correct
- check_warn, check_err = check_relay(relay, domain)
+ check_warn, check_err = check_relay(relay_host, domain)
warnings += check_warn if check_warn else warnings
errors += check_err if check_err else errors
--
GitLab