mirror of
https://github.com/docker-mailserver/docker-mailserver.git
synced 2025-08-31 15:30:50 +02:00
check-for-changes: performance improvements + wait for settle (#2104)
This commit is contained in:
parent
c2fb98ea3c
commit
232d463b81
10 changed files with 215 additions and 187 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 54e965fa9d269c2b3ff9036d81f32bac3df0edea
|
||||
Subproject commit 9f27e3c47d70ad5aa99e4674593155652c195344
|
|
@ -113,9 +113,11 @@ function teardown_file() {
|
|||
cp "$(private_config_path mail_lets_acme_json)/letsencrypt/acme-changed.json" "$(private_config_path mail_lets_acme_json)/acme.json"
|
||||
sleep 11
|
||||
run docker exec mail_lets_acme_json /bin/bash -c "supervisorctl tail changedetector"
|
||||
assert_output --partial "Changes to checksum files detected"
|
||||
sleep 6
|
||||
run docker exec mail_lets_acme_json /bin/bash -c "supervisorctl tail changedetector"
|
||||
assert_output --partial "postfix: stopped"
|
||||
assert_output --partial "postfix: started"
|
||||
assert_output --partial "Change detected"
|
||||
|
||||
run docker exec mail_lets_acme_json /bin/bash -c "cat /etc/letsencrypt/live/mail.my-domain.com/key.pem"
|
||||
assert_output "$(cat "$(private_config_path mail_lets_acme_json)/letsencrypt/changed/key.pem")"
|
||||
|
|
|
@ -51,7 +51,7 @@ function teardown_file() {
|
|||
run docker exec mail_with_relays grep -e domainzero.tld /etc/postfix/relayhost_map
|
||||
assert_output ''
|
||||
run ./setup.sh -c mail_with_relays email add user0@domainzero.tld password123
|
||||
run_until_success_or_timeout 10 docker exec mail_with_relays grep -e domainzero.tld /etc/postfix/relayhost_map
|
||||
run_until_success_or_timeout 15 docker exec mail_with_relays grep -e domainzero.tld /etc/postfix/relayhost_map
|
||||
assert_output -e '^@domainzero.tld[[:space:]]+\[default.relay.com\]:2525$'
|
||||
}
|
||||
|
||||
|
@ -59,7 +59,7 @@ function teardown_file() {
|
|||
run docker exec mail_with_relays grep -e domain2.tld /etc/postfix/relayhost_map
|
||||
assert_output ''
|
||||
run ./setup.sh -c mail_with_relays alias add user2@domain2.tld user2@domaintwo.tld
|
||||
run_until_success_or_timeout 10 docker exec mail_with_relays grep -e domain2.tld /etc/postfix/relayhost_map
|
||||
run_until_success_or_timeout 15 docker exec mail_with_relays grep -e domain2.tld /etc/postfix/relayhost_map
|
||||
assert_output -e '^@domain2.tld[[:space:]]+\[default.relay.com\]:2525$'
|
||||
}
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ function setup_file
|
|||
--name "${CONTAINER_NAME}" \
|
||||
--cap-add=SYS_PTRACE \
|
||||
-v "${PRIVATE_CONFIG}":/tmp/docker-mailserver \
|
||||
-v "${CDIR}/test/test-files":/tmp/docker-mailserver-test:ro \
|
||||
-v "$(pwd)/test/test-files":/tmp/docker-mailserver-test:ro \
|
||||
-e DEFAULT_RELAY_HOST=default.relay.host.invalid:25 \
|
||||
-e PERMIT_DOCKER=host \
|
||||
-e DMS_DEBUG=0 \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue