SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-tmpfiles: apply "ruff format" and "ruff check --fix"

Browse Source 
This also dropped unnecessary existence check for subprocess.run.
This commit is contained in:
Yu Watanabe
2026-05-18 02:44:46 +09:00
parent 6e4c7f91f9
commit f8a3f9d135
1 changed files with 74 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test-systemd-tmpfiles.py
+74 -45
View File
@@ -6,13 +6,13 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
import grp
import os
import sys
import pwd
import socket
import subprocess
import sys
import tempfile
import pwd
import grp
from pathlib import Path
try:
@@ -20,40 +20,41 @@ try:
except ImportError:
id128 = None
EX_DATAERR = 65 # from sysexits.h
EX_DATAERR = 65 # from sysexits.h
EXIT_TEST_SKIP = 77
try:
subprocess.run
except AttributeError:
sys.exit(EXIT_TEST_SKIP)
exe_with_args = sys.argv[1:]
temp_dir = tempfile.TemporaryDirectory(prefix='test-systemd-tmpfiles.')
# If /tmp isn't owned by either 'root' or the current user
# systemd-tmpfiles will exit with "Detected unsafe path transition"
# breaking this test
tmpowner = os.stat("/tmp").st_uid
tmpowner = os.stat('/tmp').st_uid
if tmpowner != 0 and tmpowner != os.getuid():
print("Skip: /tmp is not owned by 'root' or current user")
sys.exit(EXIT_TEST_SKIP)
def test_line(line, *, user, returncode=EX_DATAERR, extra={}):
args = ['--user'] if user else []
print('Running {} on {!r}'.format(' '.join(exe_with_args + args), line))
c = subprocess.run(exe_with_args + ['--create', '-'] + args,
input=line, stdout=subprocess.PIPE, universal_newlines=True,
**extra)
c = subprocess.run(
exe_with_args + ['--create', '-'] + args,
input=line,
stdout=subprocess.PIPE,
text=True,
**extra,
)
assert c.returncode == returncode, c
def test_invalids(*, user):
test_line('asdfa', user=user)
test_line('f "open quote', user=user)
test_line('f closed quote""', user=user)
test_line('Y /unknown/letter', user=user)
test_line('w non/absolute/path', user=user)
test_line('s', user=user) # s is for short
test_line('s', user=user) # s is for short
test_line('f!! /too/many/bangs', user=user)
test_line('f++ /too/many/plusses', user=user)
test_line('f+!+ /too/many/plusses', user=user)
@@ -77,12 +78,18 @@ def test_invalids(*, user):
test_line('h - - -', user=user)
test_line('H - - -', user=user)
def test_uninitialized_t():
if os.getuid() == 0:
return
test_line('w /foo - - - - "specifier for --user %t"',
user=True, returncode=0, extra={'env':{'HOME': os.getenv('HOME')}})
test_line(
'w /foo - - - - "specifier for --user %t"',
user=True,
returncode=0,
extra={'env': {'HOME': os.getenv('HOME')}},
)
def test_content(line, expected, *, user, extra={}, subpath='/arg', path_cb=None):
d = tempfile.TemporaryDirectory(prefix='test-content.', dir=temp_dir.name)
@@ -92,24 +99,25 @@ def test_content(line, expected, *, user, extra={}, subpath='/arg', path_cb=None
spec = line.format(arg)
test_line(spec, user=user, returncode=0, extra=extra)
content = open(arg).read()
print('expect: {!r}\nactual: {!r}'.format(expected, content))
print(f'expect: {expected!r}\nactual: {content!r}')
assert content == expected
def test_valid_specifiers(*, user):
test_content('f {} - - - - two words', 'two words', user=user)
if id128 and os.path.isfile('/etc/machine-id'):
try:
test_content('f {} - - - - %m', '{}'.format(id128.get_machine().hex), user=user)
test_content('f {} - - - - %m', f'{id128.get_machine().hex}', user=user)
except AssertionError as e:
print(e)
print('/etc/machine-id: {!r}'.format(open('/etc/machine-id').read()))
print('/proc/cmdline: {!r}'.format(open('/proc/cmdline').read()))
print('skipping')
test_content('f {} - - - - %b', '{}'.format(id128.get_boot().hex), user=user)
test_content('f {} - - - - %H', '{}'.format(socket.gethostname()), user=user)
test_content('f {} - - - - %v', '{}'.format(os.uname().release), user=user)
test_content('f {} - - - - %U', '{}'.format(os.getuid() if user else 0), user=user)
test_content('f {} - - - - %G', '{}'.format(os.getgid() if user else 0), user=user)
test_content('f {} - - - - %b', f'{id128.get_boot().hex}', user=user)
test_content('f {} - - - - %H', f'{socket.gethostname()}', user=user)
test_content('f {} - - - - %v', f'{os.uname().release}', user=user)
test_content('f {} - - - - %U', f'{os.getuid() if user else 0}', user=user)
test_content('f {} - - - - %G', f'{os.getgid() if user else 0}', user=user)
try:
puser = pwd.getpwuid(os.getuid() if user else 0)
@@ -117,7 +125,7 @@ def test_valid_specifiers(*, user):
puser = None
if puser:
test_content('f {} - - - - %u', '{}'.format(puser.pw_name), user=user)
test_content('f {} - - - - %u', f'{puser.pw_name}', user=user)
try:
pgroup = grp.getgrgid(os.getgid() if user else 0)
@@ -125,52 +133,55 @@ def test_valid_specifiers(*, user):
pgroup = None
if pgroup:
test_content('f {} - - - - %g', '{}'.format(pgroup.gr_name), user=user)
test_content('f {} - - - - %g', f'{pgroup.gr_name}', user=user)
# Note that %h is the only specifier in which we look the environment,
# because we check $HOME. Should we even be doing that?
home = os.path.expanduser("~")
test_content('f {} - - - - %h', '{}'.format(home), user=user)
home = os.path.expanduser('~')
test_content('f {} - - - - %h', f'{home}', user=user)
xdg_runtime_dir = os.getenv('XDG_RUNTIME_DIR')
if xdg_runtime_dir is not None or not user:
test_content('f {} - - - - %t',
xdg_runtime_dir if user else '/run',
user=user)
user=user) # fmt: skip
xdg_state_home = os.getenv('XDG_STATE_HOME')
if xdg_state_home is None and user:
xdg_state_home = os.path.join(home, ".local/state")
xdg_state_home = os.path.join(home, '.local/state')
test_content('f {} - - - - %S',
xdg_state_home if user else '/var/lib',
user=user)
user=user) # fmt: skip
xdg_cache_home = os.getenv('XDG_CACHE_HOME')
if xdg_cache_home is None and user:
xdg_cache_home = os.path.join(home, ".cache")
xdg_cache_home = os.path.join(home, '.cache')
test_content('f {} - - - - %C',
xdg_cache_home if user else '/var/cache',
user=user)
user=user) # fmt: skip
test_content('f {} - - - - %L',
os.path.join(xdg_state_home, 'log') if user else '/var/log',
user=user)
user=user) # fmt: skip
test_content('f {} - - - - %%', '%', user=user)
def mkfifo(parent, subpath):
os.makedirs(parent, mode=0o755, exist_ok=True)
first_component = subpath.split('/')[1]
path = parent + '/' + first_component
print('path: {}'.format(path))
print(f'path: {path}')
os.mkfifo(path)
def mkdir(parent, subpath):
first_component = subpath.split('/')[1]
path = parent + '/' + first_component
os.makedirs(path, mode=0o755, exist_ok=True)
os.symlink(path, path + '/self', target_is_directory=True)
def symlink(parent, subpath):
link_path = parent + '/link-target'
os.makedirs(parent, mode=0o755, exist_ok=True)
@@ -180,6 +191,7 @@ def symlink(parent, subpath):
path = parent + '/' + first_component
os.symlink(link_path, path, target_is_directory=True)
def file(parent, subpath):
content = 'file-' + subpath.split('/')[1]
path = parent + subpath
@@ -187,6 +199,7 @@ def file(parent, subpath):
with open(path, 'wb') as f:
f.write(content.encode())
def valid_symlink(parent, subpath):
target = 'link-target'
link_path = parent + target
@@ -195,6 +208,7 @@ def valid_symlink(parent, subpath):
path = parent + '/' + first_component
os.symlink(target, path, target_is_directory=True)
def test_hard_cleanup(*, user):
type_cbs = [None, file, mkdir, symlink]
if 'mkfifo' in dir(os):
@@ -209,29 +223,44 @@ def test_hard_cleanup(*, user):
label = 'valid_symlink-deep'
test_content('f= {} - - - - ' + label, label, user=user, subpath='/deep/1/2', path_cb=valid_symlink)
def test_base64():
test_content('f~ {} - - - - UGlmZgpQYWZmClB1ZmYgCg==', "Piff\nPaff\nPuff \n", user=False)
test_content('f~ {} - - - - UGlmZgpQYWZmClB1ZmYgCg==', 'Piff\nPaff\nPuff \n', user=False)
def test_conditionalized_execute_bit():
c = subprocess.run(exe_with_args + ['--version', '|', 'grep', '-F', '+ACL'], shell=True, stdout=subprocess.DEVNULL)
c = subprocess.run(
exe_with_args + ['--version', '|', 'grep', '-F', '+ACL'],
shell=True,
stdout=subprocess.DEVNULL,
)
if c.returncode != 0:
return 0
d = tempfile.TemporaryDirectory(prefix='test-acl.', dir=temp_dir.name)
temp = Path(d.name) / "cond_exec"
temp = Path(d.name) / 'cond_exec'
temp.touch()
temp.chmod(0o644)
test_line(f"a {temp} - - - - u:root:Xwr", user=False, returncode=0)
c = subprocess.run(["getfacl", "-Ec", temp],
stdout=subprocess.PIPE, check=True, text=True)
assert "user:root:rw-" in c.stdout
test_line(f'a {temp} - - - - u:root:Xwr', user=False, returncode=0)
c = subprocess.run(
['getfacl', '-Ec', temp],
stdout=subprocess.PIPE,
check=True,
text=True,
)
assert 'user:root:rw-' in c.stdout
temp.chmod(0o755)
test_line(f"a+ {temp} - - - - u:root:Xwr,g:root:rX", user=False, returncode=0)
c = subprocess.run(["getfacl", "-Ec", temp],
stdout=subprocess.PIPE, check=True, text=True)
assert "user:root:rwx" in c.stdout and "group:root:r-x" in c.stdout
test_line(f'a+ {temp} - - - - u:root:Xwr,g:root:rX', user=False, returncode=0)
c = subprocess.run(
['getfacl', '-Ec', temp],
stdout=subprocess.PIPE,
check=True,
text=True,
)
assert 'user:root:rwx' in c.stdout and 'group:root:r-x' in c.stdout
if __name__ == '__main__':
test_invalids(user=False)