Merge pull request #7532 from yuwata/test-execute

test-execute: add test for that DynamicUser= migrates StateDirectory=

17 files changed, 79 insertions, 25 deletions

diff --git a/test/meson.build b/test/meson.build
index 33fa28e3c4..c50757a46b 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -45,7 +45,7 @@ test_data_files = '''
         sockets.target
         son.service
         sysinit.target
-        test-execute/exec-bind-paths.service
+        test-execute/exec-bindpaths.service
         test-execute/exec-capabilityambientset-merge-nfsnobody.service
         test-execute/exec-capabilityambientset-merge.service
         test-execute/exec-capabilityambientset-nfsnobody.service
@@ -56,7 +56,9 @@ test_data_files = '''
         test-execute/exec-capabilityboundingset-simple.service
         test-execute/exec-dynamicuser-fixeduser-one-supplementarygroup.service
         test-execute/exec-dynamicuser-fixeduser.service
-        test-execute/exec-dynamicuser-state-dir.service
+        test-execute/exec-dynamicuser-statedir-migrate-step1.service
+        test-execute/exec-dynamicuser-statedir-migrate-step2.service
+        test-execute/exec-dynamicuser-statedir.service
         test-execute/exec-dynamicuser-supplementarygroups.service
         test-execute/exec-environment-empty.service
         test-execute/exec-environment-multiple.service
@@ -96,24 +98,24 @@ test_data_files = '''
         test-execute/exec-protectkernelmodules-no-capabilities.service
         test-execute/exec-protectkernelmodules-yes-capabilities.service
         test-execute/exec-protectkernelmodules-yes-mount-propagation.service
-        test-execute/exec-read-only-path-succeed.service
         test-execute/exec-readonlypaths-mount-propagation.service
+        test-execute/exec-readonlypaths-simple.service
         test-execute/exec-readonlypaths-with-bindpaths.service
         test-execute/exec-readonlypaths.service
         test-execute/exec-readwritepaths-mount-propagation.service
-        test-execute/exec-restrict-namespaces-mnt-blacklist.service
-        test-execute/exec-restrict-namespaces-mnt.service
-        test-execute/exec-restrict-namespaces-no.service
-        test-execute/exec-restrict-namespaces-yes.service
+        test-execute/exec-restrictnamespaces-mnt-blacklist.service
+        test-execute/exec-restrictnamespaces-mnt.service
+        test-execute/exec-restrictnamespaces-no.service
+        test-execute/exec-restrictnamespaces-yes.service
         test-execute/exec-runtimedirectory-mode.service
         test-execute/exec-runtimedirectory-owner-nfsnobody.service
         test-execute/exec-runtimedirectory-owner.service
         test-execute/exec-runtimedirectory.service
-        test-execute/exec-spec-interpolation.service
+        test-execute/exec-specifier-interpolation.service
         test-execute/exec-specifier.service
         test-execute/exec-specifier@.service
-        test-execute/exec-stdin-data.service
-        test-execute/exec-stdio-file.service
+        test-execute/exec-standardinput-data.service
+        test-execute/exec-standardinput-file.service
         test-execute/exec-supplementarygroups-multiple-groups-default-group-user.service
         test-execute/exec-supplementarygroups-multiple-groups-withgid.service
         test-execute/exec-supplementarygroups-multiple-groups-withuid.service
@@ -132,7 +134,7 @@ test_data_files = '''
         test-execute/exec-systemcallfilter-with-errno-number.service
         test-execute/exec-umask-0177.service
         test-execute/exec-umask-default.service
-        test-execute/exec-unset-environment.service
+        test-execute/exec-unsetenvironment.service
         test-execute/exec-user-nfsnobody.service
         test-execute/exec-user.service
         test-execute/exec-workingdirectory.service
diff --git a/test/test-execute/exec-bind-paths.service b/test/test-execute/exec-bind-paths.service
deleted file mode 100644
index e6584c8ef4..0000000000
--- a/test/test-execute/exec-bind-paths.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Service]
-Type=oneshot
-# Create a file in /tmp/test-exec_bind_paths
-ExecStart=/bin/sh -c 'touch /tmp/test-exec_bind_paths/thisisasimpletest'
-# Then, the file can be access through /tmp
-ExecStart=/bin/sh -c 'test -f /tmp/thisisasimpletest'
-# Also, through /tmp/test-exec_bind_readonly_paths
-ExecStart=/bin/sh -c 'test -f /tmp/test-exec_bind_readonly_paths/thisisasimpletest'
-# The file cannot modify through /tmp/test-exec_bind_readonly_paths
-ExecStart=/bin/sh -x -c '! touch /tmp/test-exec_bind_readonly_paths/thisisasimpletest'
-# Cleanup
-ExecStart=/bin/sh -c 'rm /tmp/thisisasimpletest'
-BindPaths=/tmp:/tmp/test-exec_bind_paths
-BindReadOnlyPaths=/tmp:/tmp/test-exec_bind_readonly_paths
diff --git a/test/test-execute/exec-bindpaths.service b/test/test-execute/exec-bindpaths.service
new file mode 100644
index 0000000000..7bd8fa7402
--- /dev/null
+++ b/test/test-execute/exec-bindpaths.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Test for BindPaths= and BindReadOnlyPaths=
+
+[Service]
+Type=oneshot
+# Create a file in /tmp/test-exec-bindpaths
+ExecStart=/bin/sh -c 'touch /tmp/test-exec-bindpaths/thisisasimpletest'
+# Then, the file can be access through /tmp
+ExecStart=/bin/sh -c 'test -f /tmp/thisisasimpletest'
+# Also, through /tmp/test-exec-bindreadonlypaths
+ExecStart=/bin/sh -c 'test -f /tmp/test-exec-bindreadonlypaths/thisisasimpletest'
+# The file cannot modify through /tmp/test-exec-bindreadonlypaths
+ExecStart=/bin/sh -x -c '! touch /tmp/test-exec-bindreadonlypaths/thisisasimpletest'
+# Cleanup
+ExecStart=/bin/sh -c 'rm /tmp/thisisasimpletest'
+BindPaths=/tmp:/tmp/test-exec-bindpaths
+BindReadOnlyPaths=/tmp:/tmp/test-exec-bindreadonlypaths
diff --git a/test/test-execute/exec-dynamicuser-statedir-migrate-step1.service b/test/test-execute/exec-dynamicuser-statedir-migrate-step1.service
new file mode 100644
index 0000000000..83bdfb311a
--- /dev/null
+++ b/test/test-execute/exec-dynamicuser-statedir-migrate-step1.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Test DynamicUser= migrate StateDirectory= (preparation)
+
+[Service]
+ExecStart=/bin/sh -c 'test -w /var/lib/test-dynamicuser-migrate'
+ExecStart=/bin/sh -c 'test -w /var/lib/test-dynamicuser-migrate2/hoge'
+ExecStart=/bin/sh -c 'test ! -L /var/lib/test-dynamicuser-migrate'
+ExecStart=/bin/sh -c 'test ! -L /var/lib/test-dynamicuser-migrate2/hoge'
+ExecStart=/bin/sh -c 'test -d /var/lib/test-dynamicuser-migrate'
+ExecStart=/bin/sh -c 'test -d /var/lib/test-dynamicuser-migrate2/hoge'
+ExecStart=/bin/sh -c 'touch /var/lib/test-dynamicuser-migrate/yay'
+ExecStart=/bin/sh -c 'touch /var/lib/test-dynamicuser-migrate2/hoge/yayyay'
+
+Type=oneshot
+DynamicUser=no
+StateDirectory=test-dynamicuser-migrate test-dynamicuser-migrate2/hoge
diff --git a/test/test-execute/exec-dynamicuser-statedir-migrate-step2.service b/test/test-execute/exec-dynamicuser-statedir-migrate-step2.service
new file mode 100644
index 0000000000..8154922a2f
--- /dev/null
+++ b/test/test-execute/exec-dynamicuser-statedir-migrate-step2.service
@@ -0,0 +1,24 @@
+[Unit]
+Description=Test DynamicUser= migrate StateDirectory= (preparation)
+
+[Service]
+ExecStart=/bin/sh -c 'test -w /var/lib/test-dynamicuser-migrate'
+ExecStart=/bin/sh -c 'test -w /var/lib/test-dynamicuser-migrate2/hoge'
+ExecStart=/bin/sh -c 'test -L /var/lib/test-dynamicuser-migrate'
+ExecStart=/bin/sh -c 'test -L /var/lib/test-dynamicuser-migrate2/hoge'
+ExecStart=/bin/sh -c 'test -d /var/lib/test-dynamicuser-migrate'
+ExecStart=/bin/sh -c 'test -d /var/lib/test-dynamicuser-migrate2/hoge'
+ExecStart=/bin/sh -c 'test -f /var/lib/test-dynamicuser-migrate/yay'
+ExecStart=/bin/sh -c 'test -f /var/lib/test-dynamicuser-migrate2/hoge/yayyay'
+ExecStart=/bin/sh -c 'test -d /var/lib/private/test-dynamicuser-migrate'
+ExecStart=/bin/sh -c 'test -d /var/lib/private/test-dynamicuser-migrate2/hoge'
+ExecStart=/bin/sh -c 'test -f /var/lib/private/test-dynamicuser-migrate/yay'
+ExecStart=/bin/sh -c 'test -f /var/lib/private/test-dynamicuser-migrate2/hoge/yayyay'
+ExecStart=/bin/sh -c 'touch /var/lib/test-dynamicuser-migrate/yay'
+ExecStart=/bin/sh -c 'touch /var/lib/test-dynamicuser-migrate2/hoge/yayyay'
+ExecStart=/bin/sh -c 'touch /var/lib/private/test-dynamicuser-migrate/yay'
+ExecStart=/bin/sh -c 'touch /var/lib/private/test-dynamicuser-migrate2/hoge/yayyay'
+
+Type=oneshot
+DynamicUser=yes
+StateDirectory=test-dynamicuser-migrate test-dynamicuser-migrate2/hoge
diff --git a/test/test-execute/exec-dynamicuser-state-dir.service b/test/test-execute/exec-dynamicuser-statedir.service
index cc09c938cf..cc09c938cf 100644
--- a/test/test-execute/exec-dynamicuser-state-dir.service
+++ b/test/test-execute/exec-dynamicuser-statedir.service
diff --git a/test/test-execute/exec-read-only-path-succeed.service b/test/test-execute/exec-readonlypaths-simple.service
index 754dc92790..a9a715905c 100644
--- a/test/test-execute/exec-read-only-path-succeed.service
+++ b/test/test-execute/exec-readonlypaths-simple.service
@@ -1,3 +1,6 @@
+[Unit]
+Description=Test for ReadOnlyPaths=
+
 [Service]
 Type=oneshot
 # This should work, as we explicitly disable the effect of ReadOnlyPaths=
diff --git a/test/test-execute/exec-restrict-namespaces-mnt-blacklist.service b/test/test-execute/exec-restrictnamespaces-mnt-blacklist.service
index ab909cbd94..ab909cbd94 100644
--- a/test/test-execute/exec-restrict-namespaces-mnt-blacklist.service
+++ b/test/test-execute/exec-restrictnamespaces-mnt-blacklist.service
diff --git a/test/test-execute/exec-restrict-namespaces-mnt.service b/test/test-execute/exec-restrictnamespaces-mnt.service
index 1aeed72717..1aeed72717 100644
--- a/test/test-execute/exec-restrict-namespaces-mnt.service
+++ b/test/test-execute/exec-restrictnamespaces-mnt.service
diff --git a/test/test-execute/exec-restrict-namespaces-no.service b/test/test-execute/exec-restrictnamespaces-no.service
index 33500302d2..33500302d2 100644
--- a/test/test-execute/exec-restrict-namespaces-no.service
+++ b/test/test-execute/exec-restrictnamespaces-no.service
diff --git a/test/test-execute/exec-restrict-namespaces-yes.service b/test/test-execute/exec-restrictnamespaces-yes.service
index 3fe70e2bea..3fe70e2bea 100644
--- a/test/test-execute/exec-restrict-namespaces-yes.service
+++ b/test/test-execute/exec-restrictnamespaces-yes.service
diff --git a/test/test-execute/exec-spec-interpolation.service b/test/test-execute/exec-specifier-interpolation.service
index 3e62662aa9..3e62662aa9 100644
--- a/test/test-execute/exec-spec-interpolation.service
+++ b/test/test-execute/exec-specifier-interpolation.service
diff --git a/test/test-execute/exec-specifier.service b/test/test-execute/exec-specifier.service
index aebdd7c4c2..37852390ac 100644
--- a/test/test-execute/exec-specifier.service
+++ b/test/test-execute/exec-specifier.service
@@ -1,3 +1,6 @@
+[Unit]
+Description=Test for specifiers
+
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/test %n = exec-specifier.service
diff --git a/test/test-execute/exec-specifier@.service b/test/test-execute/exec-specifier@.service
index 1038f05027..0015dffca6 100644
--- a/test/test-execute/exec-specifier@.service
+++ b/test/test-execute/exec-specifier@.service
@@ -1,3 +1,6 @@
+[Unit]
+Description=Test for specifiers (template unit)
+
 [Service]
 Type=oneshot
 ExecStart=/usr/bin/test %n = exec-specifier@foo-bar.service
diff --git a/test/test-execute/exec-stdin-data.service b/test/test-execute/exec-standardinput-data.service
index 1ca536ffc5..1ca536ffc5 100644
--- a/test/test-execute/exec-stdin-data.service
+++ b/test/test-execute/exec-standardinput-data.service
diff --git a/test/test-execute/exec-stdio-file.service b/test/test-execute/exec-standardinput-file.service
index 8fd11caf8e..8fd11caf8e 100644
--- a/test/test-execute/exec-stdio-file.service
+++ b/test/test-execute/exec-standardinput-file.service
diff --git a/test/test-execute/exec-unset-environment.service b/test/test-execute/exec-unsetenvironment.service
index 5b0123b81e..5b0123b81e 100644
--- a/test/test-execute/exec-unset-environment.service
+++ b/test/test-execute/exec-unsetenvironment.service