Skip to content

Commit 4bdb229

Browse files
committed
ci: double the tests timeout duration
1 parent ab930cb commit 4bdb229

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

test/tests/container_restart/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ for domain in "${domains[@]}"; do
4141

4242
# Check if container restarted
4343
timeout="$(date +%s)"
44-
timeout="$((timeout + 60))"
44+
timeout="$((timeout + 120))"
4545
until grep "$domain" "${GITHUB_WORKSPACE}"/test/tests/container_restart/docker_event_out.txt; do
4646
if [[ "$(date +%s)" -gt "$timeout" ]]; then
4747
echo "Container $domain didn't restart in under one minute."

test/tests/default_cert/run.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function default_cert_subject {
3939
user_cn="user-provided"
4040

4141
timeout="$(date +%s)"
42-
timeout="$((timeout + 60))"
42+
timeout="$((timeout + 120))"
4343
until docker exec "$le_container_name" [[ -f /etc/nginx/certs/default.crt ]]; do
4444
if [[ "$(date +%s)" -gt "$timeout" ]]; then
4545
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
6060
docker exec "$le_container_name" /app/cleanup_test_artifacts --default-cert
6161
docker restart "$le_container_name" > /dev/null
6262
timeout="$(date +%s)"
63-
timeout="$((timeout + 60))"
63+
timeout="$((timeout + 120))"
6464
while [[ "$(default_cert_fingerprint)" == "$old_default_cert_fingerprint" ]]; do
6565
if [[ "$(date +%s)" -gt "$timeout" ]]; then
6666
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 \
7979
-keyout /etc/nginx/certs/default.key \
8080
-out /etc/nginx/certs/default.crt &> /dev/null
8181
old_default_cert_fingerprint="$(default_cert_fingerprint)"
82-
docker restart "$le_container_name" > /dev/null && sleep 5
82+
docker restart "$le_container_name" > /dev/null && sleep 10
8383
timeout="$(date +%s)"
84-
timeout="$((timeout + 55))"
84+
timeout="$((timeout + 110))"
8585
while [[ "$(default_cert_fingerprint)" == "$old_default_cert_fingerprint" ]]; do
8686
if [[ "$(date +%s)" -gt "$timeout" ]]; then
8787
echo "Default cert wasn't re-created under one minute when the certificate expire in less than three months."

test/tests/test-functions.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ function wait_for_standalone_conf {
123123
local name="${2:?}"
124124
local timeout
125125
timeout="$(date +%s)"
126-
timeout="$((timeout + 60))"
126+
timeout="$((timeout + 120))"
127127
local target
128128
until docker exec "$name" [ -f "/etc/nginx/conf.d/standalone-cert-$domain.conf" ]; do
129129
if [[ "$(date +%s)" -gt "$timeout" ]]; then
@@ -143,7 +143,7 @@ function wait_for_symlink {
143143
local expected_target="${3:-}"
144144
local timeout
145145
timeout="$(date +%s)"
146-
timeout="$((timeout + 60))"
146+
timeout="$((timeout + 120))"
147147
local target
148148
until docker exec "$name" [ -L "/etc/nginx/certs/$domain.crt" ]; do
149149
if [[ "$(date +%s)" -gt "$timeout" ]]; then
@@ -173,7 +173,7 @@ function wait_for_symlink_rm {
173173
local name="${2:?}"
174174
local timeout
175175
timeout="$(date +%s)"
176-
timeout="$((timeout + 60))"
176+
timeout="$((timeout + 120))"
177177
until docker exec "$name" [ ! -L "/etc/nginx/certs/$domain.crt" ]; do
178178
if [[ "$(date +%s)" -gt "$timeout" ]]; then
179179
echo "Certificate symlink for $domain was not removed under one minute, timing out."
@@ -281,7 +281,7 @@ function wait_for_conn {
281281

282282
local timeout
283283
timeout="$(date +%s)"
284-
timeout="$((timeout + 60))"
284+
timeout="$((timeout + 120))"
285285
action="${action:---no-match}"
286286
string="${string:-letsencrypt-nginx-proxy-companion}"
287287

0 commit comments

Comments
 (0)