From f16a65e62947fa808f6149b37fd027073b95a953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu> Date: Thu, 23 Mar 2017 16:58:18 +0100 Subject: [PATCH] PEP8 --- tests/test_email.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_email.py b/tests/test_email.py index ba5f55b1..fe90f9de 100755 --- a/tests/test_email.py +++ b/tests/test_email.py @@ -46,11 +46,13 @@ def check_listening_port(): print_green('Postfix is listening port 25 correctly.') return True + def check_spf(ip): status, output = subprocess.getstatusoutput('host -t TXT ubicast.eu') if ip in output: return True + def check_relay(): print('Checking if SMTP relay conforms to conf.') status, out = subprocess.getstatusoutput('grep relayhost /etc/postfix/main.cf') @@ -60,7 +62,7 @@ def check_relay(): configured_relay = None if not configured_relay: # no relay configured, check relayless situations - domain = '.'.join(conf.get('MS_SERVER_NAME').split('.')[-2:]) + # domain = '.'.join(conf.get('MS_SERVER_NAME').split('.')[-2:]) ip = conf.get('NETWORK_IP_NAT') if not ip: ip = conf.get('NETWORK_IP') -- GitLab