diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-30 17:09:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 17:09:33 +0100 |
| commit | 3fac03cf04e68eb3351aff8c33bac6bea85810f6 (patch) | |
| tree | f83b1980c62a066edba6fce7cd4f5b2649659bd7 /test | |
| parent | 771f8c628bef17eb183efce8c7ee7a91cbf4087b (diff) | |
| parent | 9a10e2124bb11027fc71db4c495c116277b8b7e3 (diff) | |
| download | podman-3fac03cf04e68eb3351aff8c33bac6bea85810f6.tar.gz podman-3fac03cf04e68eb3351aff8c33bac6bea85810f6.tar.bz2 podman-3fac03cf04e68eb3351aff8c33bac6bea85810f6.zip | |
Merge pull request #12449 from vrothberg/fix-12438
systemd: replace multi-user with default.target
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/systemd_test.go | 2 | ||||
| -rw-r--r-- | test/system/250-systemd.bats | 11 | ||||
| -rw-r--r-- | test/system/255-auto-update.bats | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/test/e2e/systemd_test.go b/test/e2e/systemd_test.go index 6b4df939c..2ad8e81e6 100644 --- a/test/e2e/systemd_test.go +++ b/test/e2e/systemd_test.go @@ -35,7 +35,7 @@ ExecStart=/usr/bin/podman start -a redis ExecStop=/usr/bin/podman stop -t 10 redis KillMode=process [Install] -WantedBy=multi-user.target +WantedBy=default.target ` }) diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats index 4757f7643..56d36934d 100644 --- a/test/system/250-systemd.bats +++ b/test/system/250-systemd.bats @@ -34,6 +34,12 @@ function service_setup() { systemctl daemon-reload + # Also test enabling services (see #12438). + run systemctl enable "$SERVICE_NAME" + if [ $status -ne 0 ]; then + die "Error enabling systemd unit $SERVICE_NAME, output: $output" + fi + run systemctl start "$SERVICE_NAME" if [ $status -ne 0 ]; then die "Error starting systemd unit $SERVICE_NAME, output: $output" @@ -53,6 +59,11 @@ function service_cleanup() { die "Error stopping systemd unit $SERVICE_NAME, output: $output" fi + run systemctl disable "$SERVICE_NAME" + if [ $status -ne 0 ]; then + die "Error disbling systemd unit $SERVICE_NAME, output: $output" + fi + if [[ -z "$status" ]]; then run systemctl is-active "$SERVICE_NAME" if [ $status -ne 0 ]; then diff --git a/test/system/255-auto-update.bats b/test/system/255-auto-update.bats index 99211f304..7540270bd 100644 --- a/test/system/255-auto-update.bats +++ b/test/system/255-auto-update.bats @@ -366,7 +366,7 @@ Type=oneshot ExecStart=/usr/bin/podman auto-update [Install] -WantedBy=multi-user.target default.target +WantedBy=default.target EOF echo "podman-auto-update-$cname" >> $SNAME_FILE |