Skip to content

Commit

Permalink
TEST-15: also test hierarchical drop-ins for slices
Browse files Browse the repository at this point in the history
Slices are worth testing too, because they don't need a fragment path so they
behave slightly differently than service units. I'm making this a separate
patch from the actual tests that I wanted to add later because it's complex
enough on its own.

(cherry picked from commit f80c874af376052b6b81f47cbbc43d7fecd98cd6)

Related: #2156620
  • Loading branch information
keszybz authored and dtardon committed Jul 13, 2023
1 parent f133ef6 commit 8f185c9
Showing 1 changed file with 34 additions and 3 deletions.
37 changes: 34 additions & 3 deletions test/TEST-15-DROPIN/test-dropin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ EOF
clear_units {a,b,c}.service
}

test_hierarchical_dropins () {
echo "Testing hierarchical dropins..."
test_hierarchical_service_dropins () {
echo "Testing hierarchical service dropins..."
echo "*** test service.d/ top level drop-in"
create_services a-b-c
check_ko a-b-c ExecCondition "/bin/echo service.d"
Expand All @@ -153,6 +153,36 @@ ExecCondition=/bin/echo $dropin
clear_units a-b-c.service
}

test_hierarchical_slice_dropins () {
echo "Testing hierarchical slice dropins..."
echo "*** test slice.d/ top level drop-in"
# Slice units don't even need a fragment, so we test the defaults here
check_ok a-b-c.slice Description "a-b-c.slice"
check_ok a-b-c.slice MemoryMax "infinity"

# Test drop-ins
for dropin in slice.d a-.slice.d a-b-.slice.d a-b-c.slice.d; do
mkdir -p /usr/lib/systemd/system/$dropin
echo "
[Slice]
MemoryMax=1000000000
" >/usr/lib/systemd/system/$dropin/override.conf
systemctl daemon-reload
check_ok a-b-c.slice MemoryMax "1000000000"
rm /usr/lib/systemd/system/$dropin/override.conf
done

# Test unit with a fragment
echo "
[Slice]
MemoryMax=1000000001
" >/usr/lib/systemd/system/a-b-c.slice
systemctl daemon-reload
check_ok a-b-c.slice MemoryMax "1000000001"

clear_units a-b-c.slice
}

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

Expand Down Expand Up @@ -338,7 +368,8 @@ test_invalid_dropins () {
}

test_basic_dropins
test_hierarchical_dropins
test_hierarchical_service_dropins
test_hierarchical_slice_dropins
test_template_dropins
test_alias_dropins
test_masked_dropins
Expand Down

0 comments on commit 8f185c9

Please sign in to comment.