Skip to content

Commit

Permalink
TEST-15: add one more test for drop-in precedence
Browse files Browse the repository at this point in the history
(cherry picked from commit c3fa408dcc03bb6dbd11f180540fb9e684893c39)

Related: #2156620
  • Loading branch information
keszybz authored and dtardon committed Jul 13, 2023
1 parent 97d75f7 commit b565b04
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions test/TEST-15-DROPIN/test-dropin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,41 @@ MemoryMax=1000000001
clear_units a-b-c.slice
}

test_transient_service_dropins () {
echo "Testing dropins for a transient service..."
echo "*** test transient service drop-ins"

mkdir -p /etc/systemd/system/service.d
mkdir -p /etc/systemd/system/a-.service.d
mkdir -p /etc/systemd/system/a-b-.service.d
mkdir -p /etc/systemd/system/a-b-c.service.d

echo -e '[Service]\nStandardInputText=aaa' >/etc/systemd/system/service.d/drop1.conf
echo -e '[Service]\nStandardInputText=bbb' >/etc/systemd/system/a-.service.d/drop2.conf
echo -e '[Service]\nStandardInputText=ccc' >/etc/systemd/system/a-b-.service.d/drop3.conf
echo -e '[Service]\nStandardInputText=ddd' >/etc/systemd/system/a-b-c.service.d/drop4.conf

# There's no fragment yet, so this fails
systemctl cat a-b-c.service && exit 1

# xxx → eHh4Cg==
systemd-run --unit a-b-c.service -p StandardInputData=eHh4Cg== sleep infinity

data=$(systemctl show --value -p StandardInputData a-b-c.service)
# xxx\naaa\n\bbb\nccc\nddd\n → eHh4…
test "$data" = "eHh4CmFhYQpiYmIKY2NjCmRkZAo="

# Do a reload and check again
systemctl daemon-reload
data=$(systemctl show --value -p StandardInputData a-b-c.service)
test "$data" = "eHh4CmFhYQpiYmIKY2NjCmRkZAo="

clear_units a-b-c.service
rm /etc/systemd/system/service.d/drop1.conf \
/etc/systemd/system/a-.service.d/drop2.conf \
/etc/systemd/system/a-b-.service.d/drop3.conf
}

test_template_dropins () {
echo "Testing template dropins..."

Expand Down Expand Up @@ -420,6 +455,7 @@ test_invalid_dropins () {
test_basic_dropins
test_hierarchical_service_dropins
test_hierarchical_slice_dropins
test_transient_service_dropins
test_template_dropins
test_alias_dropins
test_masked_dropins
Expand Down

0 comments on commit b565b04

Please sign in to comment.