diff --git a/tests/scripts/test_email.py b/tests/scripts/test_email.py index 3efb3cfe766c0cc43203e905cafbc54d4f8db95f..070df67c32e90adb81de6947ef31fd4c984d41d2 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')