From 25033cca08485607aacf22ab67baf70e35eae30b Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 25 Aug 2023 16:23:14 +0900 Subject: [PATCH] test-execute: check credentials can be read on ExecStartPost= and friends Prompted by https://github.com/systemd/systemd/pull/28787#issuecomment-1690614202. --- test/test-execute/exec-credentials-dir-specifier.service | 6 ++++++ test/test-execute/exec-load-credential.service | 3 +++ test/test-execute/exec-set-credential.service | 3 +++ 3 files changed, 12 insertions(+) diff --git a/test/test-execute/exec-credentials-dir-specifier.service b/test/test-execute/exec-credentials-dir-specifier.service index 818619acaa7..5e71eee246d 100644 --- a/test/test-execute/exec-credentials-dir-specifier.service +++ b/test/test-execute/exec-credentials-dir-specifier.service @@ -10,3 +10,9 @@ ExecStart=test %d/very_top_secret = "${CREDENTIALS_DIRECTORY}/very_top_secret" LoadCredential=very_top_secret ExecStart=test %d/very_top_secret = "${CREDENTIALS_DIRECTORY}/very_top_secret" ExecStart=sh -c 'test %d/very_top_secret = "$TOP_SECRET"' +ExecStartPost=test %d/very_top_secret = "${CREDENTIALS_DIRECTORY}/very_top_secret" +ExecStartPost=sh -c 'test %d/very_top_secret = "$TOP_SECRET"' +ExecStop=test %d/very_top_secret = "${CREDENTIALS_DIRECTORY}/very_top_secret" +ExecStop=sh -c 'test %d/very_top_secret = "$TOP_SECRET"' +ExecStopPost=test %d/very_top_secret = "${CREDENTIALS_DIRECTORY}/very_top_secret" +ExecStopPost=sh -c 'test %d/very_top_secret = "$TOP_SECRET"' diff --git a/test/test-execute/exec-load-credential.service b/test/test-execute/exec-load-credential.service index b3e36500756..3a29b6d13dc 100644 --- a/test/test-execute/exec-load-credential.service +++ b/test/test-execute/exec-load-credential.service @@ -4,5 +4,8 @@ Description=Test for LoadCredential= [Service] ExecStart=/bin/sh -x -c 'test "$$(cat %d/test-execute.load-credential)" = "foo"' +ExecStartPost=/bin/sh -x -c 'test "$$(cat %d/test-execute.load-credential)" = "foo"' +ExecStop=/bin/sh -x -c 'test "$$(cat %d/test-execute.load-credential)" = "foo"' +ExecStopPost=/bin/sh -x -c 'test "$$(cat %d/test-execute.load-credential)" = "foo"' Type=oneshot LoadCredential=test-execute.load-credential diff --git a/test/test-execute/exec-set-credential.service b/test/test-execute/exec-set-credential.service index 2af236dc4bf..9db6c5f3d4f 100644 --- a/test/test-execute/exec-set-credential.service +++ b/test/test-execute/exec-set-credential.service @@ -4,5 +4,8 @@ Description=Test for SetCredential= [Service] ExecStart=/bin/sh -x -c 'test "$$(cat %d/test-execute.set-credential)" = "hoge"' +ExecStartPost=/bin/sh -x -c 'test "$$(cat %d/test-execute.set-credential)" = "hoge"' +ExecStop=/bin/sh -x -c 'test "$$(cat %d/test-execute.set-credential)" = "hoge"' +ExecStopPost=/bin/sh -x -c 'test "$$(cat %d/test-execute.set-credential)" = "hoge"' Type=oneshot SetCredential=test-execute.set-credential:hoge -- 2.47.3