mirror/ docker-letsencrypt-nginx-proxy-companion
1
0
Fork 0
mirror of https://github.com/nginx-proxy/docker-letsencrypt-nginx-proxy-companion synced 2024-04-26 20:05:08 +02:00
Code Issues Releases Activity

ci: double the tests timeout duration

This commit is contained in:
Nicolas Duchon 2021-04-05 14:32:04 +02:00
parent ab930cba5f
commit 4bdb229e51
No known key found for this signature in database
GPG Key ID: EA3151C66A4D79E7
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/tests/container_restart/run.sh
View File

@ -41,7 +41,7 @@ for domain in "${domains[@]}"; do
# Check if container restarted
timeout="$(date +%s)"
timeout="$((timeout + 60))"
timeout="$((timeout + 120))"
until grep "$domain" "${GITHUB_WORKSPACE}"/test/tests/container_restart/docker_event_out.txt; do
if [[ "$(date +%s)" -gt "$timeout" ]]; then
echo "Container $domain didn't restart in under one minute."

8
test/tests/default_cert/run.sh
View File

@ -39,7 +39,7 @@ function default_cert_subject {
user_cn="user-provided"
timeout="$(date +%s)"
timeout="$((timeout + 60))"
timeout="$((timeout + 120))"
until docker exec "$le_container_name" [[ -f /etc/nginx/certs/default.crt ]]; do
if [[ "$(date +%s)" -gt "$timeout" ]]; then
echo "Default cert wasn't created under one minute at container first launch."
@ -60,7 +60,7 @@ for file in 'default.key' 'default.crt'; do
docker exec "$le_container_name" /app/cleanup_test_artifacts --default-cert
docker restart "$le_container_name" > /dev/null
timeout="$(date +%s)"
timeout="$((timeout + 60))"
timeout="$((timeout + 120))"
while [[ "$(default_cert_fingerprint)" == "$old_default_cert_fingerprint" ]]; do
if [[ "$(date +%s)" -gt "$timeout" ]]; then
echo "Default cert wasn't re-created under one minute after $file deletion."
@ -79,9 +79,9 @@ docker exec "$le_container_name" openssl req -x509 \
-keyout /etc/nginx/certs/default.key \
-out /etc/nginx/certs/default.crt &> /dev/null
old_default_cert_fingerprint="$(default_cert_fingerprint)"
docker restart "$le_container_name" > /dev/null && sleep 5
docker restart "$le_container_name" > /dev/null && sleep 10
timeout="$(date +%s)"
timeout="$((timeout + 55))"
timeout="$((timeout + 110))"
while [[ "$(default_cert_fingerprint)" == "$old_default_cert_fingerprint" ]]; do
if [[ "$(date +%s)" -gt "$timeout" ]]; then
echo "Default cert wasn't re-created under one minute when the certificate expire in less than three months."

8
test/tests/test-functions.sh
View File

@ -123,7 +123,7 @@ function wait_for_standalone_conf {
local name="${2:?}"
local timeout
timeout="$(date +%s)"
timeout="$((timeout + 60))"
timeout="$((timeout + 120))"
local target
until docker exec "$name" [ -f "/etc/nginx/conf.d/standalone-cert-$domain.conf" ]; do
if [[ "$(date +%s)" -gt "$timeout" ]]; then
@ -143,7 +143,7 @@ function wait_for_symlink {
local expected_target="${3:-}"
local timeout
timeout="$(date +%s)"
timeout="$((timeout + 60))"
timeout="$((timeout + 120))"
local target
until docker exec "$name" [ -L "/etc/nginx/certs/$domain.crt" ]; do
if [[ "$(date +%s)" -gt "$timeout" ]]; then
@ -173,7 +173,7 @@ function wait_for_symlink_rm {
local name="${2:?}"
local timeout
timeout="$(date +%s)"
timeout="$((timeout + 60))"
timeout="$((timeout + 120))"
until docker exec "$name" [ ! -L "/etc/nginx/certs/$domain.crt" ]; do
if [[ "$(date +%s)" -gt "$timeout" ]]; then
echo "Certificate symlink for $domain was not removed under one minute, timing out."
@ -281,7 +281,7 @@ function wait_for_conn {
local timeout
timeout="$(date +%s)"
timeout="$((timeout + 60))"
timeout="$((timeout + 120))"
action="${action:---no-match}"
string="${string:-letsencrypt-nginx-proxy-companion}"