sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

python:tests: Remove unnecessary f‐strings

Browse Source 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Joseph Sutton 2023-11-24 14:46:56 +13:00 committed by Andrew Bartlett
parent 2eb7b95de3
commit abab561d44
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/samba/tests/blackbox/claims.py
View File

@ -75,7 +75,7 @@ class ClaimsSupportTests(BlackboxTestCase):
self.addCleanup(self.run_command, "group delete allowed-devices")
# Set allowed to authenticate from.
self.check_run(f"domain auth policy modify --name=device-restricted-users-pol "
self.check_run("domain auth policy modify --name=device-restricted-users-pol "
"--user-allowed-to-authenticate-from-device-group=allowed-devices")
self.check_run("user auth policy assign claimstestuser --policy=device-restricted-users-pol")
@ -144,7 +144,7 @@ class ClaimsSupportTests(BlackboxTestCase):
# Set allowed to authenticate from (where the login can happen) and to
# (server requires silo that in term has this rule, so knows the user
# was required to authenticate from).
self.check_run(f"domain auth policy modify --name=allowed-devices-only-pol "
self.check_run("domain auth policy modify --name=allowed-devices-only-pol "
"--user-allowed-to-authenticate-from-device-silo=allowed-devices-only-silo")
# Grant access to silo.
@ -244,7 +244,7 @@ class ClaimsSupportTests(BlackboxTestCase):
# --service-allowed-to-authenticate-to/from options as well.
# Likewise, if there are services running in user accounts, we need
# --user-allowed-to-authenticate-to
self.check_run(f"domain auth policy modify --name=allowed-devices-only-pol "
self.check_run("domain auth policy modify --name=allowed-devices-only-pol "
"--user-allowed-to-authenticate-from-device-silo=allowed-devices-only-silo "
"--computer-allowed-to-authenticate-to-by-silo=allowed-devices-only-silo")
@ -350,7 +350,7 @@ class ClaimsSupportTests(BlackboxTestCase):
self.addCleanup(self.run_command, "group delete server-access-group")
# Set allowed to authenticate to.
self.check_run(f"domain auth policy modify --name=restricted-servers-pol "
self.check_run("domain auth policy modify --name=restricted-servers-pol "
"--computer-allowed-to-authenticate-to-by-group=server-access-group")
self.check_run(r"user auth policy assign claims-server\$ --policy=restricted-servers-pol")

24
python/samba/tests/conditional_ace_claims.py
View File

@ -695,27 +695,27 @@ class ConditionalAceLargeComposites(ConditionalAceClaimsBase):
"9-orderly-strings-claim-vs-itself",
True,
{'user_claims': {"c": claim_str_range(9)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.c))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.c))')
),
(
"300-orderly-strings-claim-vs-itself",
True,
{'user_claims': {"c": claim_str_range(300)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.c))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.c))')
),
(
"900-disorderly-strings-claim-vs-claim",
True,
{'user_claims': {"c": claim_str_range(900, random_seed=1),
"d": claim_str_range(900, random_seed=1)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
),
(
"9-orderly-strings-claim-mixed-case-vs-claim-case-sensitive",
False,
{'user_claims': {"c": claim_str_range(9, mix_case=True),
"d": claim_str_range(9, case_sensitive=True)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
),
(
"9-disorderly-strings-claim-vs-claim-case-sensitive-mixed-case",
@ -724,7 +724,7 @@ class ConditionalAceLargeComposites(ConditionalAceClaimsBase):
"d": claim_str_range(9,
mix_case=True,
case_sensitive=True)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
),
(
"9-disorderly-strings-claim-vs-claim-case-sensitive-both-mixed-case",
@ -735,7 +735,7 @@ class ConditionalAceLargeComposites(ConditionalAceClaimsBase):
"d": claim_str_range(9,
mix_case=True,
case_sensitive=True)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
),
(
"9-disorderly-strings-claim-vs-claim-case-sensitive-ne",
@ -744,7 +744,7 @@ class ConditionalAceLargeComposites(ConditionalAceClaimsBase):
"d": claim_str_range(9,
mix_case=True,
case_sensitive=True)}},
(f'D:(XA;;FA;;;WD;(@USER.c != @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c != @USER.d))')
),
(
@ -757,7 +757,7 @@ class ConditionalAceLargeComposites(ConditionalAceClaimsBase):
mix_case=True,
random_seed=3,
case_sensitive=True)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
),
(
"90-disorderly-strings-claim-vs-int-claim",
@ -766,7 +766,7 @@ class ConditionalAceLargeComposites(ConditionalAceClaimsBase):
random_seed=2),
"d": claim_int_range(90,
random_seed=3)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
),
(
"90-disorderly-ints-claim-vs-string-claim",
@ -775,7 +775,7 @@ class ConditionalAceLargeComposites(ConditionalAceClaimsBase):
random_seed=2),
"d": claim_str_range(90,
random_seed=3)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
),
(
"9-disorderly-strings-vs-9+90-dupes",
@ -832,14 +832,14 @@ class ConditionalAceLargeComposites(ConditionalAceClaimsBase):
False,
{'user_claims': {"c": claim_str_range(90,
random_seed=2)}},
(f'D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
('D:(XA;;FA;;;WD;(@USER.c == @USER.d))')
),
(
"missing-claim-vs-90-disorderly-strings",
False,
{'user_claims': {"c": claim_str_range(90,
random_seed=2)}},
(f'D:(XA;;FA;;;WD;(@USER.z == @USER.c))')
('D:(XA;;FA;;;WD;(@USER.z == @USER.c))')
),
(