bats updates

This commit is contained in:
Andy Arthur
2022-12-19 16:52:22 -08:00
parent 30cebd135a
commit 9c62afd73b
3 changed files with 2 additions and 7 deletions

View File

@@ -107,8 +107,8 @@ start_multi_db_server() {
# kill the process if it's still running
stop_sql_server() {
# Clean up any mysql.sock file in the default, global location
rm -f /tmp/mysql.sock
rm -f /tmp/dolt.$PORT.sock
if [ -f "/tmp/mysql.sock" ]; then rm -f /tmp/mysql.sock; fi
if [ -f "/tmp/dolt.$PORT.sock" ]; then rm -f /tmp/dolt.$PORT.sock; fi
wait=$1
if [ ! -z "$SERVER_PID" ]; then

View File

@@ -111,8 +111,6 @@ teardown() {
dolt config --local --add sqlserver.global.dolt_replicate_heads main
start_sql_server repo2 && sleep 1
skip "todo"
dolt sql-client --use-db repo2 -P $PORT -u dolt -q "show tables" -r csv
run dolt sql-client --use-db repo2 -P $PORT -u dolt -q "show tables" -r csv
[ $status -eq 0 ]
[[ "$output" =~ "Tables_in_repo2" ]] || false
@@ -261,10 +259,8 @@ teardown() {
dolt config --local --add sqlserver.global.dolt_replicate_heads main
start_sql_server repo2
dolt sql-client --use-db repo2 -P $PORT -u dolt -q "show tables"
run dolt sql-client --use-db repo2 -P $PORT -u dolt -q "show tables"
[ $status -eq 0 ]
skip "todo"
[[ $output =~ "Tables_in_repo2" ]] || false
[[ $output =~ "test" ]] || false
}

View File

@@ -1468,7 +1468,6 @@ databases:
}
@test "sql-server: sql-server lock for new databases" {
skip "hangs"
cd repo1
start_sql_server
dolt sql-client -P $PORT -u dolt --use-db '' -q "create database newdb"