github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

tests(fix): wait_until_change_detection_event_completes to count (#2974)

Browse source
This commit is contained in:
Brennan Kinney 2023-01-05 01:29:10 +13:00 committed by GitHub
parent 1fd407b3d0
commit b7bad82e07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
test/helper/common.bash
View file

@ -153,7 +153,7 @@ function wait_for_changes_to_be_detected_in_container() {
repeat_in_container_until_success_or_timeout "${TIMEOUT}" "${CONTAINER_NAME}" bash -c 'source /usr/local/bin/helpers/index.sh; _obtain_hostname_and_domainname; cmp --silent -- <(_monitored_files_checksums) "${CHKSUM_FILE}" >/dev/null' repeat_in_container_until_success_or_timeout "${TIMEOUT}" "${CONTAINER_NAME}" bash -c 'source /usr/local/bin/helpers/index.sh; _obtain_hostname_and_domainname; cmp --silent -- <(_monitored_files_checksums) "${CHKSUM_FILE}" >/dev/null'
} }
# Relies on ENV `LOG_LEVEL=debug` or higher # NOTE: Relies on ENV `LOG_LEVEL=debug` or higher
function wait_until_change_detection_event_completes() { function wait_until_change_detection_event_completes() {
local CONTAINER_NAME="${1}" local CONTAINER_NAME="${1}"
# Ensure early failure if arg is missing: # Ensure early failure if arg is missing:
@ -164,31 +164,20 @@ function wait_until_change_detection_event_completes() {
$(docker exec "${CONTAINER_NAME}" env | grep '^LOG_LEVEL=') \ $(docker exec "${CONTAINER_NAME}" env | grep '^LOG_LEVEL=') \
'=(debug|trace)$' '=(debug|trace)$'
local CHANGE_EVENT_START='Change detected' # NOTE: Change events can start and finish all within < 1 sec,
local CHANGE_EVENT_END='Completed handling of detected change' # debug log # Reliably track the completion of a change event by comparing the before/after count:
function __change_event_count() {
function __change_event_status() { docker exec "${CONTAINER_NAME}" grep --count "${CHANGE_EVENT_END}" /var/log/supervisor/changedetector.log
docker exec "${CONTAINER_NAME}" \
grep -oE "${CHANGE_EVENT_START}|${CHANGE_EVENT_END}" /var/log/supervisor/changedetector.log \
| tail -1
}
function __is_changedetector_processing() {
[[ $(__change_event_status) == "${CHANGE_EVENT_START}" ]]
} }
function __is_changedetector_finished() { function __is_changedetector_finished() {
[[ $(__change_event_status) == "${CHANGE_EVENT_END}" ]] [[ $(__change_event_count) -gt "${NUM_CHANGE_EVENTS_BEFORE}" ]]
} }
# A new change event is expected, # Count by completions of this debug log line from `check-for-changes.sh`:
# If the last event status is not yet `CHANGE_EVENT_START`, wait until it is: local CHANGE_EVENT_END='Completed handling of detected change'
if ! __is_changedetector_processing local NUM_CHANGE_EVENTS_BEFORE=$(__change_event_count)
then
repeat_until_success_or_timeout 60 __is_changedetector_processing
fi
# Change event is in progress, wait until it finishes:
repeat_until_success_or_timeout 60 __is_changedetector_finished repeat_until_success_or_timeout 60 __is_changedetector_finished
} }

29
test/test_helper/common.bash
View file

@ -173,7 +173,7 @@ function wait_for_changes_to_be_detected_in_container() {
repeat_in_container_until_success_or_timeout "${TIMEOUT}" "${CONTAINER_NAME}" bash -c 'source /usr/local/bin/helpers/index.sh; _obtain_hostname_and_domainname; cmp --silent -- <(_monitored_files_checksums) "${CHKSUM_FILE}" >/dev/null' repeat_in_container_until_success_or_timeout "${TIMEOUT}" "${CONTAINER_NAME}" bash -c 'source /usr/local/bin/helpers/index.sh; _obtain_hostname_and_domainname; cmp --silent -- <(_monitored_files_checksums) "${CHKSUM_FILE}" >/dev/null'
} }
# Relies on ENV `LOG_LEVEL=debug` or higher # NOTE: Relies on ENV `LOG_LEVEL=debug` or higher
function wait_until_change_detection_event_completes() { function wait_until_change_detection_event_completes() {
local CONTAINER_NAME="${1}" local CONTAINER_NAME="${1}"
# Ensure early failure if arg is missing: # Ensure early failure if arg is missing:
@ -184,31 +184,20 @@ function wait_until_change_detection_event_completes() {
$(docker exec "${CONTAINER_NAME}" env | grep '^LOG_LEVEL=') \ $(docker exec "${CONTAINER_NAME}" env | grep '^LOG_LEVEL=') \
'=(debug|trace)$' '=(debug|trace)$'
local CHANGE_EVENT_START='Change detected' # NOTE: Change events can start and finish all within < 1 sec,
local CHANGE_EVENT_END='Completed handling of detected change' # debug log # Reliably track the completion of a change event by comparing the before/after count:
function __change_event_count() {
function __change_event_status() { docker exec "${CONTAINER_NAME}" grep --count "${CHANGE_EVENT_END}" /var/log/supervisor/changedetector.log
docker exec "${CONTAINER_NAME}" \
grep -oE "${CHANGE_EVENT_START}|${CHANGE_EVENT_END}" /var/log/supervisor/changedetector.log \
| tail -1
}
function __is_changedetector_processing() {
[[ $(__change_event_status) == "${CHANGE_EVENT_START}" ]]
} }
function __is_changedetector_finished() { function __is_changedetector_finished() {
[[ $(__change_event_status) == "${CHANGE_EVENT_END}" ]] [[ $(__change_event_count) -gt "${NUM_CHANGE_EVENTS_BEFORE}" ]]
} }
# A new change event is expected, # Count by completions of this debug log line from `check-for-changes.sh`:
# If the last event status is not yet `CHANGE_EVENT_START`, wait until it is: local CHANGE_EVENT_END='Completed handling of detected change'
if ! __is_changedetector_processing local NUM_CHANGE_EVENTS_BEFORE=$(__change_event_count)
then
repeat_until_success_or_timeout 60 __is_changedetector_processing
fi
# Change event is in progress, wait until it finishes:
repeat_until_success_or_timeout 60 __is_changedetector_finished repeat_until_success_or_timeout 60 __is_changedetector_finished
} }