reformat python files with ruff

This commit is contained in:
InsanePrawn 2025-03-29 19:54:42 +01:00
parent 4cd1b0bf2e
commit 4f4d8cb479
58 changed files with 4460 additions and 2197 deletions

View file

@ -16,7 +16,7 @@ def run_func(f, expected_user: Optional[str] = None, **kwargs):
current_uid = os.getuid()
current_username = get_username(current_uid)
target_uid = current_uid
result = f(['id', '-u'], capture_output=True, **kwargs)
result = f(["id", "-u"], capture_output=True, **kwargs)
assert isinstance(result, subprocess.CompletedProcess)
result.check_returncode()
if expected_user and current_username != expected_user:
@ -25,12 +25,14 @@ def run_func(f, expected_user: Optional[str] = None, **kwargs):
assert int(result_uid) == target_uid
def run_generate_and_exec(script, generate_args={}, switch_user=None, **kwargs):
def run_generate_and_exec(
script, generate_args={}, switch_user=None, **kwargs
):
"runs generate_cmd_su() and executes the resulting argv"
if not switch_user:
switch_user = get_username(os.getuid())
cmd = generate_cmd_su(script, switch_user=switch_user, **generate_args)
logging.debug(f'run_generate_and_exec: running {cmd}')
logging.debug(f"run_generate_and_exec: running {cmd}")
return subprocess.run(
cmd,
**kwargs,
@ -38,21 +40,36 @@ def run_generate_and_exec(script, generate_args={}, switch_user=None, **kwargs):
def test_generate_su_force_su():
run_func(run_generate_and_exec, generate_args={'force_su': True})
run_func(run_generate_and_exec, generate_args={"force_su": True})
def test_generate_su_force_elevate():
run_func(run_generate_and_exec, generate_args={'force_elevate': True}, expected_user='root', switch_user='root')
run_func(
run_generate_and_exec,
generate_args={"force_elevate": True},
expected_user="root",
switch_user="root",
)
def test_generate_su_nobody_force_su():
user = 'nobody'
run_func(run_generate_and_exec, expected_user=user, switch_user=user, generate_args={'force_su': True})
user = "nobody"
run_func(
run_generate_and_exec,
expected_user=user,
switch_user=user,
generate_args={"force_su": True},
)
def test_generate_su_nobody_force_su_and_elevate():
user = 'nobody'
run_func(run_generate_and_exec, expected_user=user, switch_user=user, generate_args={'force_su': True, 'force_elevate': True})
user = "nobody"
run_func(
run_generate_and_exec,
expected_user=user,
switch_user=user,
generate_args={"force_su": True, "force_elevate": True},
)
def test_run_cmd():
@ -60,13 +77,13 @@ def test_run_cmd():
def test_run_cmd_su_nobody():
user = 'nobody'
user = "nobody"
run_func(run_cmd, expected_user=user, switch_user=user)
def test_run_cmd_as_root():
run_func(run_cmd, expected_user='root', switch_user='root')
run_func(run_cmd, expected_user="root", switch_user="root")
def test_run_root_cmd():
run_func(run_root_cmd, expected_user='root')
run_func(run_root_cmd, expected_user="root")