From 9abc8de3a20a5f5b60dafb8b59682570d2788dd1 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Wed, 7 Jun 2023 16:24:34 -0700 Subject: [PATCH 1/2] Fixed two bats tests --- integration-tests/bats/db-revision-specifiers.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-tests/bats/db-revision-specifiers.bats b/integration-tests/bats/db-revision-specifiers.bats index 7342bc1428..f599596a11 100644 --- a/integration-tests/bats/db-revision-specifiers.bats +++ b/integration-tests/bats/db-revision-specifiers.bats @@ -95,7 +95,7 @@ use $database_name/v1; insert into test values (100, 'beige'); SQL [ "$status" -ne "0" ] - [[ "$output" =~ "$database_name is read-only" ]] || false + [[ "$output" =~ "$database_name/v1 is read-only" ]] || false } @test "db-revision-specifiers: commit-qualified database revisions" { @@ -133,5 +133,5 @@ use $database_name/$commit; insert into test values (100, 'beige'); SQL [ "$status" -ne "0" ] - [[ "$output" =~ "$database_name is read-only" ]] || false + [[ "$output" =~ "$database_name/$commit is read-only" ]] || false } From 2e4fb2ad7cee86be483d8fdd2a7feaf090e24d43 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Wed, 7 Jun 2023 16:28:54 -0700 Subject: [PATCH 2/2] Fixed bats test for diff error message --- integration-tests/bats/deleted-branches.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-tests/bats/deleted-branches.bats b/integration-tests/bats/deleted-branches.bats index adf9bc3a4e..336be53360 100644 --- a/integration-tests/bats/deleted-branches.bats +++ b/integration-tests/bats/deleted-branches.bats @@ -62,7 +62,7 @@ force_delete_main_branch_on_sqlserver() { run dolt sql-client --use-db "dolt_repo_$$" -u dolt -P $PORT \ -q "call dolt_checkout('to_keep');" [ $status -ne 0 ] - [[ "$output" =~ "database not found" ]] || false + [[ "$output" =~ "cannot resolve default branch head for database" ]] || false } @test "deleted-branches: dolt branch from the CLI does not allow deleting the last branch" {