system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-07 00:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19487 from mrc0mmand/test-all-services-in-TEST-01

Browse source 
test: don't mask "supporting" services in TEST-01-BASIC
This commit is contained in:
Yu Watanabe 2021-05-03 12:15:29 +09:00 committed by GitHub
parent d49b881eaf 0868f6d4e6
commit 7afc8abdf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
test/test-functions
View file

@ -1551,11 +1551,11 @@ setup_basic_dirs() {
mask_supporting_services() {
# mask some services that we do not want to run in these tests
ln -fs /dev/null "${initdir:?}/etc/systemd/system/systemd-hwdb-update.service"
ln -fs /dev/null "$initdir/etc/systemd/system/systemd-journal-catalog-update.service"
ln -fs /dev/null "$initdir/etc/systemd/system/systemd-networkd.service"
ln -fs /dev/null "$initdir/etc/systemd/system/systemd-networkd.socket"
ln -fs /dev/null "$initdir/etc/systemd/system/systemd-resolved.service"
ln -fsv /dev/null "${initdir:?}/etc/systemd/system/systemd-hwdb-update.service"
ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-journal-catalog-update.service"
ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-networkd.service"
ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-networkd.socket"
ln -fsv /dev/null "$initdir/etc/systemd/system/systemd-resolved.service"
}
inst_libs() {
@ -2335,7 +2335,13 @@ test_create_image() {
(
LOG_LEVEL=5
setup_basic_environment
mask_supporting_services
# We want to test all services in TEST-01-BASIC, but mask them in
# all other tests
if [[ "$TESTID" != "01" ]]; then
dinfo "Masking supporting services"
mask_supporting_services
fi
)
}

1
test/units/testsuite-01.service
View file

@ -1,6 +1,7 @@
[Unit]
Description=TEST-01-BASIC
After=multi-user.target
Wants=systemd-resolved.service systemd-networkd.service
[Service]
ExecStartPre=rm -f /failed /testok