Skip to content

Commit ce68b16

Browse files
committed
wait for startup
1 parent c51defc commit ce68b16

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

test/run-entrypoint-tests.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
#
2121
##
2222

23+
# Container initialization wait time in seconds
24+
CONTAINER_INIT_WAIT=3
25+
2326
if [ -z "$REDIS_IMG" ]; then
2427
echo "REDIS_IMG may not be empty"
2528
exit 1
@@ -38,6 +41,7 @@ get_container_user_uid_gid_on_the_host() {
3841
container_user="$1"
3942
dir=$(mktemp -d -p .)
4043
docker run --rm -v "$(pwd)/$dir":/w -w /w --entrypoint=/bin/sh "$REDIS_IMG" -c "chown $container_user ."
44+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
4145
stat -c "%u %g" "$dir"
4246
sudo rm -rf "$dir"
4347
}
@@ -177,6 +181,7 @@ run_docker_and_test_ownership() {
177181
fi
178182

179183
docker_output=$($docker_run 2>&1)
184+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
180185

181186
if [ "$TEST_VERBOSE" ]; then
182187
echo "After:"
@@ -265,6 +270,7 @@ run_redis_docker_and_check_uid_gid() {
265270
docker_cmd="$*"
266271
# shellcheck disable=SC2086
267272
container=$(docker run $docker_flags -d "$REDIS_IMG" $docker_cmd)
273+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
268274
ret=$?
269275

270276
assertTrue "Container '$docker_flags $REDIS_IMG $docker_cmd' created" "[ $ret -eq 0 ]"
@@ -296,6 +302,7 @@ run_redis_docker_and_check_modules() {
296302
docker_cmd="$1"
297303
# shellcheck disable=SC2086
298304
container=$(docker run --rm -d "$REDIS_IMG" $docker_cmd)
305+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
299306
info=$(docker exec "$container" redis-cli info)
300307

301308
[ "$PLATFORM" ] && [ "$PLATFORM" != "amd64" ] && startSkipping
@@ -322,6 +329,7 @@ assert_redis_v8() {
322329

323330
test_redis_version() {
324331
ret=$(docker run --rm "$REDIS_IMG" -v|tail -n 1)
332+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
325333
assert_redis_v8 "$ret"
326334
}
327335

@@ -545,6 +553,7 @@ test_redis_server_persistence_with_bind_mount() {
545553
chmod 0444 "$dir"
546554

547555
container=$(docker run --rm -d -v "$(pwd)/$dir":/data "$REDIS_IMG" --appendonly yes)
556+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
548557

549558
result=$(echo save | docker exec -i "$container" redis-cli)
550559
assertEquals "OK" "$result"
@@ -559,6 +568,7 @@ test_redis_server_persistence_with_bind_mount() {
559568
sudo chown -R "$HOST_OWNER" "$dir"
560569

561570
container2=$(docker run --rm -d -v "$(pwd)/$dir":/data "$REDIS_IMG")
571+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
562572
value=$(echo "GET FOO" | docker exec -i "$container2" redis-cli)
563573
assertEquals "$container" "$value"
564574

@@ -576,6 +586,7 @@ test_redis_server_persistence_with_volume() {
576586
docker run --rm -v test_redis:/data --entrypoint=/bin/sh "$REDIS_IMG" -c 'chown -R 0:0 /data'
577587

578588
container=$(docker run --rm -d -v test_redis:/data "$REDIS_IMG" --appendonly yes)
589+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
579590

580591
result=$(echo save | docker exec -i "$container" redis-cli)
581592
assertEquals "OK" "$result"
@@ -590,6 +601,7 @@ test_redis_server_persistence_with_volume() {
590601
docker run --rm -v test_redis:/data --entrypoint=/bin/sh "$REDIS_IMG" -c 'chown -R 0:0 /data && chmod 0000 -R /data'
591602

592603
container2=$(docker run --rm -d -v test_redis:/data "$REDIS_IMG")
604+
sleep $CONTAINER_INIT_WAIT # Wait for container to fully initialize
593605
value=$(echo "GET FOO" | docker exec -i "$container2" redis-cli)
594606
assertEquals "$container" "$value"
595607

0 commit comments

Comments
 (0)