From ac98d83aa8296461a40a4710997e7a2a3d89af54 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 24 Nov 2023 22:03:08 +0000 Subject: [PATCH] Be sure to set the returner address Signed-off-by: Pedro Algarvio --- tests/pytests/scenarios/compat/test_with_versions.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/pytests/scenarios/compat/test_with_versions.py b/tests/pytests/scenarios/compat/test_with_versions.py index 75a2b87f24c..ecb3a73de1a 100644 --- a/tests/pytests/scenarios/compat/test_with_versions.py +++ b/tests/pytests/scenarios/compat/test_with_versions.py @@ -29,7 +29,7 @@ pytestmark = [ def _get_test_versions_ids(value): - return "SaltMinion~={}".format(value) + return f"SaltMinion~={value}" @pytest.fixture( @@ -41,13 +41,13 @@ def compat_salt_version(request): @pytest.fixture(scope="module") def minion_image_name(compat_salt_version): - return "salt-{}".format(compat_salt_version) + return f"salt-{compat_salt_version}" @pytest.fixture(scope="function") def minion_id(compat_salt_version): return random_string( - "salt-{}-".format(compat_salt_version), + f"salt-{compat_salt_version}-", uppercase=False, ) @@ -70,7 +70,10 @@ def salt_minion( config_overrides = { "master": salt_master.config["interface"], "user": False, - "pytest-minion": {"log": {"host": host_docker_network_ip_address}}, + "pytest-minion": { + "log": {"host": host_docker_network_ip_address}, + "returner_address": {"host": host_docker_network_ip_address}, + }, # We also want to scrutinize the key acceptance "open_mode": False, }