Skip to content

Commit efad7a0

Browse files
russozrussoz
authored
unit tests: use f-strings (#10993)
1 parent e177d1e commit efad7a0

25 files changed

+54
-78
lines changed

‎tests/unit/plugins/become/test_doas.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ def test_doas_basic(mocker, parser, reset_cli_args):
3131
var_options = {}
3232
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
3333
print(cmd)
34-
assert (re.match("""%s %s %s -c 'echo %s; %s'""" % (doas_exe, doas_flags, default_exe, success,
35-
default_cmd), cmd) is not None)
34+
assert (re.match(f"""{doas_exe} {doas_flags} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
3635

3736

3837
def test_doas(mocker, parser, reset_cli_args):
@@ -54,8 +53,7 @@ def test_doas(mocker, parser, reset_cli_args):
5453
var_options = {}
5554
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
5655
print(cmd)
57-
assert (re.match("""%s %s -u %s %s -c 'echo %s; %s'""" % (doas_exe, doas_flags, task['become_user'], default_exe, success,
58-
default_cmd), cmd) is not None)
56+
assert (re.match(f"""{doas_exe} {doas_flags} -u {task['become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
5957

6058

6159
def test_doas_varoptions(mocker, parser, reset_cli_args):
@@ -80,5 +78,4 @@ def test_doas_varoptions(mocker, parser, reset_cli_args):
8078
}
8179
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
8280
print(cmd)
83-
assert (re.match("""%s %s -u %s %s -c 'echo %s; %s'""" % (doas_exe, doas_flags, var_options['ansible_become_user'], default_exe, success,
84-
default_cmd), cmd) is not None)
81+
assert (re.match(f"""{doas_exe} {doas_flags} -u {var_options['ansible_become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)

‎tests/unit/plugins/become/test_dzdo.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ def test_dzdo_basic(mocker, parser, reset_cli_args):
3131
var_options = {}
3232
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
3333
print(cmd)
34-
assert re.match("""%s %s %s -c 'echo %s; %s'""" % (dzdo_exe, dzdo_flags, default_exe,
35-
success, default_cmd), cmd) is not None
34+
assert re.match(f"""{dzdo_exe} {dzdo_flags} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None
3635

3736

3837
def test_dzdo(mocker, parser, reset_cli_args):
@@ -54,8 +53,7 @@ def test_dzdo(mocker, parser, reset_cli_args):
5453
var_options = {}
5554
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
5655
print(cmd)
57-
assert re.match("""%s %s -u %s %s -c 'echo %s; %s'""" % (dzdo_exe, dzdo_flags, task['become_user'], default_exe,
58-
success, default_cmd), cmd) is not None
56+
assert re.match(f"""{dzdo_exe} {dzdo_flags} -u {task['become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None
5957
task['become_pass'] = 'testpass'
6058
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
6159
print(cmd)
@@ -85,8 +83,7 @@ def test_dzdo_varoptions(mocker, parser, reset_cli_args):
8583
}
8684
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
8785
print(cmd)
88-
assert re.match("""%s %s -u %s %s -c 'echo %s; %s'""" % (dzdo_exe, dzdo_flags, var_options['ansible_become_user'], default_exe,
89-
success, default_cmd), cmd) is not None
86+
assert re.match(f"""{dzdo_exe} {dzdo_flags} -u {var_options['ansible_become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None
9087
var_options['ansible_become_pass'] = 'testpass'
9188
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
9289
print(cmd)

‎tests/unit/plugins/become/test_ksu.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ def test_ksu_basic(mocker, parser, reset_cli_args):
3232
var_options = {}
3333
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
3434
print(cmd)
35-
assert (re.match("""%s %s %s -e %s -c 'echo %s; %s'""" % (ksu_exe, task['become_user'], ksu_flags,
36-
default_exe, success, default_cmd), cmd) is not None)
35+
assert (re.match(f"""{ksu_exe} {task['become_user']} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
3736

3837

3938
def test_ksu(mocker, parser, reset_cli_args):
@@ -55,8 +54,7 @@ def test_ksu(mocker, parser, reset_cli_args):
5554
var_options = {}
5655
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
5756
print(cmd)
58-
assert (re.match("""%s %s %s -e %s -c 'echo %s; %s'""" % (ksu_exe, task['become_user'], ksu_flags,
59-
default_exe, success, default_cmd), cmd) is not None)
57+
assert (re.match(f"""{ksu_exe} {task['become_user']} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
6058

6159

6260
def test_ksu_varoptions(mocker, parser, reset_cli_args):
@@ -81,5 +79,4 @@ def test_ksu_varoptions(mocker, parser, reset_cli_args):
8179
}
8280
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
8381
print(cmd)
84-
assert (re.match("""%s %s %s -e %s -c 'echo %s; %s'""" % (ksu_exe, var_options['ansible_become_user'], ksu_flags,
85-
default_exe, success, default_cmd), cmd) is not None)
82+
assert (re.match(f"""{ksu_exe} {var_options['ansible_become_user']} {ksu_flags} -e {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)

‎tests/unit/plugins/become/test_pbrun.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ def test_pbrun_basic(mocker, parser, reset_cli_args):
3131
var_options = {}
3232
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
3333
print(cmd)
34-
assert re.match("""%s %s 'echo %s; %s'""" % (pbrun_exe, pbrun_flags,
35-
success, default_cmd), cmd) is not None
34+
assert re.match(f"""{pbrun_exe} {pbrun_flags} 'echo {success}; {default_cmd}'""", cmd) is not None
3635

3736

3837
def test_pbrun(mocker, parser, reset_cli_args):
@@ -54,8 +53,7 @@ def test_pbrun(mocker, parser, reset_cli_args):
5453
var_options = {}
5554
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
5655
print(cmd)
57-
assert re.match("""%s %s -u %s 'echo %s; %s'""" % (pbrun_exe, pbrun_flags, task['become_user'],
58-
success, default_cmd), cmd) is not None
56+
assert re.match(f"""{pbrun_exe} {pbrun_flags} -u {task['become_user']} 'echo {success}; {default_cmd}'""", cmd) is not None
5957

6058

6159
def test_pbrun_var_varoptions(mocker, parser, reset_cli_args):
@@ -80,5 +78,4 @@ def test_pbrun_var_varoptions(mocker, parser, reset_cli_args):
8078
}
8179
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
8280
print(cmd)
83-
assert re.match("""%s %s -u %s 'echo %s; %s'""" % (pbrun_exe, pbrun_flags, var_options['ansible_become_user'],
84-
success, default_cmd), cmd) is not None
81+
assert re.match(f"""{pbrun_exe} {pbrun_flags} -u {var_options['ansible_become_user']} 'echo {success}; {default_cmd}'""", cmd) is not None

‎tests/unit/plugins/become/test_pfexec.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_pfexec_basic(mocker, parser, reset_cli_args):
3131
var_options = {}
3232
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
3333
print(cmd)
34-
assert re.match("""%s %s 'echo %s; %s'""" % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
34+
assert re.match(f"""{pfexec_exe} {pfexec_flags} 'echo {success}; {default_cmd}'""", cmd) is not None
3535

3636

3737
def test_pfexec(mocker, parser, reset_cli_args):
@@ -53,7 +53,7 @@ def test_pfexec(mocker, parser, reset_cli_args):
5353
var_options = {}
5454
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
5555
print(cmd)
56-
assert re.match("""%s %s 'echo %s; %s'""" % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
56+
assert re.match(f"""{pfexec_exe} {pfexec_flags} 'echo {success}; {default_cmd}'""", cmd) is not None
5757

5858

5959
def test_pfexec_varoptions(mocker, parser, reset_cli_args):
@@ -78,4 +78,4 @@ def test_pfexec_varoptions(mocker, parser, reset_cli_args):
7878
}
7979
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
8080
print(cmd)
81-
assert re.match("""%s %s 'echo %s; %s'""" % (pfexec_exe, pfexec_flags, success, default_cmd), cmd) is not None
81+
assert re.match(f"""{pfexec_exe} {pfexec_flags} 'echo {success}; {default_cmd}'""", cmd) is not None

‎tests/unit/plugins/become/test_sudosu.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ def test_sudosu(mocker, parser, reset_cli_args):
3333
var_options = {}
3434
cmd = call_become_plugin(task, var_options, cmd=default_cmd, executable=default_exe)
3535
print(cmd)
36-
assert (re.match("""%s %s su -l %s %s -c 'echo %s; %s'""" % (sudo_exe, sudo_flags, task['become_user'],
37-
default_exe, success, default_cmd), cmd) is not None)
36+
assert (re.match(f"""{sudo_exe} {sudo_flags} su -l {task['become_user']} {default_exe} -c 'echo {success}; {default_cmd}'""", cmd) is not None)
3837

3938
task = {
4039
'become_user': 'foo',

‎tests/unit/plugins/callback/test_elastic.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ class TestOpentelemetry(unittest.TestCase):
2020
@patch('ansible_collections.community.general.plugins.callback.elastic.socket')
2121
def setUp(self, mock_socket):
2222
if sys.version_info < ELASTIC_MINIMUM_PYTHON_VERSION:
23-
self.skipTest("Python %s+ is needed for Elastic" %
24-
",".join(map(str, ELASTIC_MINIMUM_PYTHON_VERSION)))
23+
self.skipTest(f"Python {'.'.join(map(str, ELASTIC_MINIMUM_PYTHON_VERSION))}+ is needed for Elastic")
2524
mock_socket.gethostname.return_value = 'my-host'
2625
mock_socket.gethostbyname.return_value = '1.2.3.4'
2726
self.elastic = ElasticSource(display=None)

‎tests/unit/plugins/callback/test_opentelemetry.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ class TestOpentelemetry(unittest.TestCase):
2121
def setUp(self, mock_socket):
2222
# TODO: this python version validation won't be needed as long as the _time_ns call is mocked.
2323
if sys.version_info < OPENTELEMETRY_MINIMUM_PYTHON_VERSION:
24-
self.skipTest("Python %s+ is needed for OpenTelemetry" %
25-
",".join(map(str, OPENTELEMETRY_MINIMUM_PYTHON_VERSION)))
24+
self.skipTest(f"Python {'.'.join(map(str, OPENTELEMETRY_MINIMUM_PYTHON_VERSION))}+ is needed for OpenTelemetry")
2625

2726
mock_socket.gethostname.return_value = 'my-host'
2827
mock_socket.gethostbyname.return_value = '1.2.3.4'

‎tests/unit/plugins/inventory/test_icinga2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def test_populate(inventory, mocker):
9494
# module settings
9595
inventory.icinga2_user = 'ansible'
9696
inventory.icinga2_password = 'password'
97-
inventory.icinga2_url = 'https://localhost:5665' + '/v1'
97+
inventory.icinga2_url = "https://localhost:5665/v1"
9898
inventory.inventory_attr = "address"
9999
inventory.group_by_hostgroups = True
100100

‎tests/unit/plugins/inventory/test_lxd.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def test_build_inventory_groups_with_no_groupselection(inventory):
9797
group_comparative_data = {'all': [], 'ungrouped': []}
9898

9999
eq = True
100-
print("data: {0}".format(generated_data))
100+
print(f"data: {generated_data}")
101101
for key, value in group_comparative_data.items():
102102
if generated_data[key] != value:
103103
eq = False

0 commit comments

Comments
 (0)