From 50bc02c3ee46730ac5b6b5f8779e965a94f7b024 Mon Sep 17 00:00:00 2001 From: jennifersp <44716627+jennifersp@users.noreply.github.com> Date: Thu, 2 Feb 2023 10:52:13 -0800 Subject: [PATCH] [no-release-notes] fix data dump testing (#5272) --- .../data-dump-loading-tests-entrypoint.sh | 5 +---- .../data-dump-loading-tests/import-mysqldump.bats | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/integration-tests/data-dump-loading-tests/data-dump-loading-tests-entrypoint.sh b/integration-tests/data-dump-loading-tests/data-dump-loading-tests-entrypoint.sh index 7ced70d033..0a0fad13e1 100755 --- a/integration-tests/data-dump-loading-tests/data-dump-loading-tests-entrypoint.sh +++ b/integration-tests/data-dump-loading-tests/data-dump-loading-tests-entrypoint.sh @@ -1,7 +1,5 @@ #!/bin/sh -cd ./integration-tests/data-dump-loading-tests - echo "Updating dolt config for tests:" dolt config --global --add metrics.disabled true dolt config --global --add metrics.host localhost @@ -9,5 +7,4 @@ dolt config --global --add user.name mysql-test-runner dolt config --global --add user.email mysql-test-runner@liquidata.co echo "Running data-dump-loading-tests:" -bats /data-dump-loading-tests/import-mysqldump.bats -bats /data-dump-loading-tests/sakila-data-dump-load.bats +cd /data-dump-loading-tests && bats . && cd - diff --git a/integration-tests/data-dump-loading-tests/import-mysqldump.bats b/integration-tests/data-dump-loading-tests/import-mysqldump.bats index d7de7bd34f..8156c44b88 100644 --- a/integration-tests/data-dump-loading-tests/import-mysqldump.bats +++ b/integration-tests/data-dump-loading-tests/import-mysqldump.bats @@ -505,7 +505,8 @@ SQL [ "$status" -eq 0 ] [[ "$output" =~ "2" ]] || false - # Give the server a chance to drop the database + # Give the server a chance to complete the last query + # TODO: `service mysqld stop` is hanging when a check above fails. sleep 1 service mysql stop }