mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-28 20:49:43 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

add longer timeout for grep log parse

Browse Source
This commit is contained in:
elianddb
2025-10-16 10:28:25 -07:00
parent d498dc9b9a
commit 99145e0323
2 changed files with 18 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/docker-entrypoint.sh
+3 -2
View File
@@ -189,9 +189,10 @@ exec_mysql() {
output=$(dolt sql -q "$sql_command" 2>&1)
status=$?
else
set +e # tmp disable to report error to user
set +e # tmp disable to report error to user formatted
output=$(dolt sql < /dev/stdin 2>&1)
status=$?
set -e
fi
if [ "$status" -eq 0 ]; then
@@ -200,7 +201,7 @@ exec_mysql() {
fi
if echo "$output" | grep -qiE "Error [0-9]+ \([A-Z0-9]+\)"; then
mysql_error "$error_message$(echo "$output" | grep -iE "Error|error" || true)"
mysql_error "$error_message$(echo "$output" | grep -iE "Error|error")"
fi
if [ "$timeout" -ne 0 ]; then
integration-tests/bats/docker-entrypoint.bats
+15 -19
View File
@@ -18,7 +18,7 @@ setup() {
# Build from source only once per test run, check img already exists
if ! docker image inspect "$TEST_IMAGE" >/dev/null 2>&1; then
echo "Building Dolt from source for integration tests..."
echo "Building Dolt from source for `docker-entrypoint.sh` integrations container..."
docker build -f "$WORKSPACE_ROOT/dolt/docker/serverDockerfile" --build-arg DOLT_VERSION=$DOLT_DOCKER_TEST_VERSION -t "$TEST_IMAGE" "$WORKSPACE_ROOT"
else
echo "Using existing source-built image: $TEST_IMAGE"
@@ -222,7 +222,7 @@ wait_for_log() {
# bats test_tags=no_lambda
@test "docker-entrypoint: SQL error reporting without suppression" {
cname="${TEST_PREFIX}sql-error-reportin"
cname="${TEST_PREFIX}sql-error-reporting"
run_container "$cname" -e DOLT_ROOT_PASSWORD=rootpass -e DOLT_USER=testuser -e DOLT_PASSWORD=testpass
# Create the user first time (should succeed)
@@ -911,7 +911,7 @@ EOF
false
fi
if ! wait_for_log "$cname-$cycle" "Dolt init process done. Ready for connections." 15; then
if ! wait_for_log "$cname-$cycle" "Dolt init process done. Ready for connections." 30; then
docker logs "$cname-$cycle"
false
fi
@@ -924,14 +924,6 @@ EOF
echo "$output"
false
fi
if ! [[ "$output" =~ "Server ready. Accepting connections" ]]; then
echo "$output"
false
fi
if ! [[ "$output" =~ "Dolt init process done. Ready for connections." ]]; then
echo "$output"
false
fi
done
local stop_pids=()
@@ -950,10 +942,13 @@ EOF
cname="${TEST_PREFIX}server-log"
run_container_with_port "$cname" 3306
wait_for_log "$cname" "Dolt init process done. Ready for connections."
docker logs "$cname" >/tmp/${cname}.log 2>&1
run grep -F "[0] [System] [Dolt] [Server]" /tmp/"${cname}".log | grep -F -v "level="
run grep -F "[0] [System] [Dolt] [Server]" /tmp/"${cname}".log
[ $status -eq 0 ]
run ! grep -F "level=" /tmp/"${cname}".log
[ $status -ne 0 ]
}
# bats test_tags=no_lambda
@@ -961,9 +956,12 @@ EOF
cname="${TEST_PREFIX}dolt-raw"
run_container_with_port "$cname" 3306 -e DOLT_RAW=1
wait_for_log "$cname" "Dolt init process done. Ready for connections."
docker logs "$cname" >/tmp/${cname}.log 2>&1
run grep -F "level=" /tmp/"${cname}".log | grep -F -v "[0] [System] [Dolt] [Server]"
run grep -F "level=" /tmp/"${cname}".log
[ $status -eq 0 ]
run ! grep -F "[0] [System] [Dolt] [Server]" /tmp/"${cname}".log
[ $status -eq 0 ]
}
@@ -972,8 +970,8 @@ EOF
cname="${TEST_PREFIX}debug"
docker run -d --name "$cname" "$TEST_IMAGE" -l debug
wait_for_log "$cname" "Dolt init process done. Ready for connections."
docker logs "$cname" >/tmp/${cname}.log 2>&1
wait_for_log "$cname" "Dolt init process done. Ready for connections." 30
docker logs "$cname" >/tmp/"${cname}".log 2>&1
run grep -F "level=debug" /tmp/"${cname}".log
[ "$status" -eq 0 ]
@@ -1000,11 +998,9 @@ EOF
run_container_with_port "$cname" 3306 -e DOLT_ROOT_HOST=% -v "$temp_dir:/docker-entrypoint-initdb.d"
docker logs "$cname" >/tmp/${cname}.log 2>&1
# Verify the table header
run grep -F "| id | username | email |" /tmp/"${cname}".log
[ "$status" -eq 0 ]
# Verify rows
run grep -F "| 1 | alice | alice@example.com |" /tmp/"${cname}".log
[ "$status" -eq 0 ]