saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update to f-strings as per reviewers comments

Browse source
This commit is contained in:
David Murphy 2023-10-19 13:56:55 -06:00 • committed by Pedro Algarvio
parent be3b6cd64b
commit b92b13cf07
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tests/pytests/integration/runners/test_saltutil.py
View file

@ -76,7 +76,7 @@ def test_sync(
"""
Ensure modules are synced when various sync functions are called
"""
module_name = "hello_sync_{}".format(module_type)
module_name = f"hello_sync_{module_type}"
module_contents = """
def __virtual__():
return "hello"
@ -85,17 +85,17 @@ def world():
return "world"
"""
test_moduledir = salt_master.state_tree.base.write_path / "_{}".format(module_type)
test_moduledir = salt_master.state_tree.base.write_path / f"_{module_type}"
test_moduledir.mkdir(parents=True, exist_ok=True)
module_tempfile = salt_master.state_tree.base.temp_file(
"_{}/{}.py".format(module_type, module_name), module_contents
f"_{module_type}/{module_name}.py", module_contents
)
with module_tempfile:
salt_cmd = "saltutil.sync_{}".format(module_sync_functions[module_type])
salt_cmd = f"saltutil.sync_{module_sync_functions[module_type]}"
ret = salt_run_cli.run(salt_cmd)
assert ret.returncode == 0
assert "{}.hello".format(module_type) in ret.stdout
assert f"{module_type}.hello" in ret.stdout
def test_sync_refresh_false(
@ -104,7 +104,7 @@ def test_sync_refresh_false(
"""
Ensure modules are synced when various sync functions are called
"""
module_name = "hello_sync_{}".format(module_type)
module_name = f"hello_sync_{module_type}"
module_contents = """
def __virtual__():
return "hello"
@ -113,19 +113,17 @@ def world():
return "world"
"""
test_moduledir = salt_master.state_tree.base.write_path / "_{}".format(module_type)
test_moduledir = salt_master.state_tree.base.write_path / f"_{module_type}"
test_moduledir.mkdir(parents=True, exist_ok=True)
module_tempfile = salt_master.state_tree.base.temp_file(
"_{}/{}.py".format(module_type, module_name), module_contents
f"_{module_type}/{module_name}.py", module_contents
)
with module_tempfile:
salt_cmd = "saltutil.sync_{}".format(module_sync_functions[module_type])
salt_cmd = f"saltutil.sync_{module_sync_functions[module_type]}"
ret = salt_run_cli.run(salt_cmd, saltenv=None, refresh=False)
assert ret.returncode == 0
assert (
"saltutil.sync_{}".format(module_sync_functions[module_type]) in ret.stdout
)
assert f"saltutil.sync_{module_sync_functions[module_type]}" in ret.stdout
def _write_module_dir_and_file(module_type, salt_minion, salt_master):
@ -141,11 +139,11 @@ def world():
return "world"
"""
test_moduledir = salt_master.state_tree.base.paths[0] / "_{}".format(module_type)
test_moduledir = salt_master.state_tree.base.paths[0] / f"_{module_type}"
test_moduledir.mkdir(parents=True, exist_ok=True)
module_tempfile = salt_master.state_tree.base.temp_file(
"_{}/{}.py".format(module_type, module_name), module_contents
f"_{module_type}/{module_name}.py", module_contents
)
return module_tempfile
@ -169,4 +167,4 @@ def test_sync_all(salt_run_cli, salt_minion, salt_master):
assert ret.returncode == 0
for module_type in get_module_types():
assert "{}.hello".format(module_type) in ret.stdout
assert f"{module_type}.hello" in ret.stdout