From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 4 Dec 2017 08:05:05 +0000 (+0100)
Subject: test-systemd-tmpfiles: respect $HOME in test for %h expansion
X-Git-Tag: v236~54^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F7419%2Fhead;p=thirdparty%2Fsystemd.git

test-systemd-tmpfiles: respect $HOME in test for %h expansion

%h is a special specifier because we look at $HOME (unless running suid, but
let's say that this case does not apply to tmpfiles, since the code is
completely unready to be run suid). For all other specifiers we query the user
db and use those values directly. I'm not sure if this exception is good, but
let's just "document" status quo for now. If this is changes, it should be in
a separate PR.
---

diff --git a/src/test/test-systemd-tmpfiles.py b/src/test/test-systemd-tmpfiles.py
index 00362c69520..309cee23e64 100755
--- a/src/test/test-systemd-tmpfiles.py
+++ b/src/test/test-systemd-tmpfiles.py
@@ -100,7 +100,11 @@ def test_valid_specifiers(*, user):
 
     user = pwd.getpwuid(os.getuid())
     test_content('f {} - - - - %u', '{}'.format(user.pw_name), user=user)
-    test_content('f {} - - - - %h', '{}'.format(user.pw_dir), 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)
 
     xdg_runtime_dir = os.getenv('XDG_RUNTIME_DIR')
     if xdg_runtime_dir is not None or not user: