From c19472a2b89b629572bf5d16504efe126f897424 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Wed, 31 Mar 2021 10:36:26 +0200
Subject: [PATCH] Use socket.getfqdn instead of hostname -f in test_email |
refs #33810
---
tests/scripts/test_email.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/tests/scripts/test_email.py b/tests/scripts/test_email.py
index 3efb3cfe..070df67c 100755
--- a/tests/scripts/test_email.py
+++ b/tests/scripts/test_email.py
@@ -19,7 +19,6 @@ sys.path.append(str(Path(__file__).parents[1].resolve()))
# pylint: disable=wrong-import-position
from utilities import logging as lg # noqa: E402
-from utilities.commands import exec_cmd # noqa: E402
from utilities.config import load_conf # noqa: E402
from utilities.network import get_ip # noqa: E402
@@ -81,12 +80,10 @@ def check_relay(relay_host: str, relay_port: str, domain: str) -> tuple:
out = subprocess.getoutput("grep -E '^myorigin' /etc/postfix/main.cf")
myorigin = out.replace("myorigin", "").strip()
# possible origin names
- origins = set(
- (
- domain or None,
- exec_cmd("hostname", log_output=False)[1] or None,
- exec_cmd("hostname -f", log_output=False)[1] or None,
- )
+ origins = (
+ domain or None,
+ socket.gethostname(),
+ socket.getfqdn(),
)
if myorigin not in origins:
lg.warning('"myorigin" setting does not contain a valid domain')
--
GitLab