Skip to content

Wait for clamd's finish script before restarting it in the reload test #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ksylvan merged 1 commit into from
Nov 14, 2026
Merged

Wait for clamd's finish script before restarting it in the reload test #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion test/default.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,9 @@ sigs_cron_job() {
@test "checking clamav-unofficial-sigs: cron user's reload waits for clamd to start" {
reloads() { docker exec mailserver_default grep -c 'Database correctly reloaded' /var/log/clamav/clamav.log || true; }
before=$(reloads)
docker exec mailserver_default /bin/sh -c "s6-svc -d /services/clamd; while pgrep -x clamd > /dev/null; do sleep 0.2; done; s6-svc -u /services/clamd"
# Wait for clamd's finish script as well as clamd (-wD): on exit code 0 the
# finish script sends its own s6-svc -d, which undoes a -u sent before it.
docker exec mailserver_default /bin/sh -c "s6-svc -wD -d /services/clamd; s6-svc -u /services/clamd"
run docker exec mailserver_default /bin/sh -c ". /etc/clamav-unofficial-sigs/os.conf; user=\$(grep -v '^#' /etc/cron.d/clamav-unofficial-sigs | grep . | awk '{print \$6}'); su -s /bin/sh \"\$user\" -c \"\$clamd_reload_opt\""
assert_success
refute_output --partial 'ERROR'
Expand Down
Loading