mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-23 05:13:00 -05:00
Code Issues Packages Projects Releases 157 Wiki Activity

[no-release-notes] unskip more bats (#3737)

Browse Source 
* Fix merge test for __DOLT_1__

* tree.ThreeWayMerge always calls callback when key collision occurs

* add keyless support for new format merge and other merge related tables

* newline of doom

* unskip more bats

* empty

* skip blame.bats and remotes-aws.bats
This commit is contained in:
Dhruv Sringari
2022-07-01 17:00:42 -07:00
committed by GitHub
parent 45601fbf1a
commit 24cac1f6c4
39 changed files with 1368 additions and 1418 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/bats/sql-commit.bats
-7
View File
@@ -84,7 +84,6 @@ teardown() {
run dolt sql -q "SELECT DOLT_COMMIT('-a', '-m', 'Commit1')"
# Check that everything was added
skip_nbf_dolt_1
run dolt diff
[ "$status" -eq 0 ]
[ "$output" = "" ]
@@ -100,7 +99,6 @@ teardown() {
run dolt sql -q "CALL DOLT_COMMIT('-a', '-m', 'Commit1')"
# Check that everything was added
skip_nbf_dolt_1
run dolt diff
[ "$status" -eq 0 ]
[ "$output" = "" ]
@@ -118,7 +116,6 @@ teardown() {
DCOMMIT=$output
# Check that everything was added
skip_nbf_dolt_1
run dolt diff
[ "$status" -eq 0 ]
[ "$output" = "" ]
@@ -190,7 +187,6 @@ SQL
}
@test "sql-commit: DOLT_COMMIT immediately updates dolt diff system table." {
skip_nbf_dolt_1
original_hash=$(get_head_commit)
run dolt sql << SQL
SELECT DOLT_COMMIT('-a', '-m', 'Commit1');
@@ -203,7 +199,6 @@ SQL
}
@test "sql-commit: CALL DOLT_COMMIT immediately updates dolt diff system table." {
skip_nbf_dolt_1
original_hash=$(get_head_commit)
run dolt sql << SQL
CALL DOLT_COMMIT('-a', '-m', 'Commit1');
@@ -256,7 +251,6 @@ SQL
}
@test "sql-commit: DOLT_COMMIT with unstaged tables leaves them in the working set" {
skip_nbf_dolt_1
head_variable=@@dolt_repo_$$_head
run dolt sql << SQL
@@ -316,7 +310,6 @@ SQL
}
@test "sql-commit: CALL DOLT_COMMIT with unstaged tables leaves them in the working set" {
skip_nbf_dolt_1
head_variable=@@dolt_repo_$$_head
run dolt sql << SQL