Merge branch 'zachmu/bats-fix' into fulghum/kill-python

This commit is contained in:
Jason Fulghum
2023-06-07 16:30:21 -07:00
2 changed files with 3 additions and 3 deletions

View File

@@ -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
}

View File

@@ -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" {