Skip to content

Commit

Permalink
Add failing test to show service.d global drop-in does not get overri…
Browse files Browse the repository at this point in the history
…dden by more specific dropins
  • Loading branch information
GothAck committed Dec 27, 2019
1 parent 98cd752 commit f5dd6e5
Showing 1 changed file with 25 additions and 0 deletions.
25 changes: 25 additions & 0 deletions test/TEST-15-DROPIN/test-dropin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,30 @@ EOF
clear_services a b c
}

test_hierarchical_dropins () {
echo "Testing hierarchical dropins..."
echo "*** test service.d/ top level drop-in"
create_services a-b-c
check_ko a-b-c ExecCondition "/bin/echo service.d"
check_ko a-b-c ExecCondition "/bin/echo a-.service.d"
check_ko a-b-c ExecCondition "/bin/echo a-b-.service.d"
check_ko a-b-c ExecCondition "/bin/echo a-b-c.service.d"

for dropin in service.d a-.service.d a-b-.service.d a-b-c.service.d; do
mkdir -p /usr/lib/systemd/system/$dropin
echo "
[Service]
ExecCondition=/bin/echo $dropin
" > /usr/lib/systemd/system/$dropin/override.conf
check_ok a-b-c ExecCondition "/bin/echo $dropin"
done
for dropin in service.d a-.service.d a-b-.service.d a-b-c.service.d; do
rm -rf /usr/lib/systemd/system/$dropin
done

clear_services a-b-c
}

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

Expand Down Expand Up @@ -433,6 +457,7 @@ test_invalid_dropins () {
}

test_basic_dropins
test_hierarchical_dropins
test_template_dropins
test_alias_dropins
test_masked_dropins
Expand Down

0 comments on commit f5dd6e5

Please sign in to comment.