From dfc859e331216bf1a4ead41a27a89524f190663b Mon Sep 17 00:00:00 2001 From: Tim Sehn Date: Mon, 2 Jun 2025 14:41:03 -0700 Subject: [PATCH] Various unskipped bats tests identified and fixed by Claude Code. --- integration-tests/bats/cherry-pick.bats | 3 +-- .../bats/import-replace-tables.bats | 5 ++--- .../.dolt/noms/journal.idx | Bin 110954 -> 98304 bytes integration-tests/bats/performance.bats | 3 --- integration-tests/bats/sql-batch.bats | 1 - integration-tests/bats/sql-cherry-pick.bats | 3 +-- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/integration-tests/bats/cherry-pick.bats b/integration-tests/bats/cherry-pick.bats index 612bc6423f..019ae474bf 100644 --- a/integration-tests/bats/cherry-pick.bats +++ b/integration-tests/bats/cherry-pick.bats @@ -357,7 +357,6 @@ teardown() { } @test "cherry-pick: commit with DROP TABLE" { - skip # drop or rename case dolt sql -q "DROP TABLE test" dolt commit -am "Drop table test" @@ -370,7 +369,7 @@ teardown() { run dolt cherry-pick branch1 [ "$status" -eq "1" ] - [[ "$output" =~ "table was renamed or dropped" ]] || false + [[ "$output" =~ "table was modified in one branch and deleted in the other" ]] || false run dolt sql -q "SHOW TABLES" -r csv [[ "$output" =~ "test" ]] || false diff --git a/integration-tests/bats/import-replace-tables.bats b/integration-tests/bats/import-replace-tables.bats index 459afd4fae..b5d4391f90 100644 --- a/integration-tests/bats/import-replace-tables.bats +++ b/integration-tests/bats/import-replace-tables.bats @@ -128,11 +128,10 @@ CREATE TABLE employees ( PRIMARY KEY (idz) ); SQL - skip run dolt table import -r employees `batshelper employees-tbl.json` [ "$status" -eq 1 ] - [[ "$output" =~ "Error replacing table" ]] || false - [[ "$output" =~ "cause: input primary keys do not match primary keys of existing table" ]] || false + [[ "$output" =~ "An error occurred while moving data" ]] || false + [[ "$output" =~ "not found in schema" ]] || false } @test "import-replace-tables: replace table using schema with json" { diff --git a/integration-tests/bats/json-oldformat-repo/.dolt/noms/journal.idx b/integration-tests/bats/json-oldformat-repo/.dolt/noms/journal.idx index 610950fd2fff49c17f2a59991527b3c88836d6df..7e02df5beddb9a6dfcbbfaf148956c316cba264e 100644 GIT binary patch delta 10 RcmaF$h^?W4tzijc0{|Rc1bzSj delta 12760 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 diff --git a/integration-tests/bats/performance.bats b/integration-tests/bats/performance.bats index 9419633b49..de15cc3fd3 100644 --- a/integration-tests/bats/performance.bats +++ b/integration-tests/bats/performance.bats @@ -1,8 +1,6 @@ #!/usr/bin/env bats load $BATS_TEST_DIRNAME/helper/common.bash -# NOTE: These are currently disabled because the high variance in GitHub CI makes them unreliable. - # This BATS test attempts to detect performance regressions when using standard workflows on large datasets. # Please note that this is a rough approach that is not designed to detect all performance issues, merely an extra # safeguard against bugs that cause large (order-of-magnitude+) regressions. @@ -33,7 +31,6 @@ create_repo() { } setup() { - skip cp -r $BATS_TEST_DIRNAME/performance-repo/ $BATS_TMPDIR/dolt-repo-$$ cd $BATS_TMPDIR/dolt-repo-$$ } diff --git a/integration-tests/bats/sql-batch.bats b/integration-tests/bats/sql-batch.bats index 27cd999fe5..b254956486 100644 --- a/integration-tests/bats/sql-batch.bats +++ b/integration-tests/bats/sql-batch.bats @@ -136,7 +136,6 @@ SQL @test "sql-batch: batch mode detects subqueries and decides not to do batch insert." { # create the second table. - skip "TODO: something is wrong with inserting into non null columns using a subquery" dolt sql -b << SQL CREATE TABLE test2 ( pk bigint NOT NULL, diff --git a/integration-tests/bats/sql-cherry-pick.bats b/integration-tests/bats/sql-cherry-pick.bats index 09f3acc622..60761995c8 100644 --- a/integration-tests/bats/sql-cherry-pick.bats +++ b/integration-tests/bats/sql-cherry-pick.bats @@ -281,7 +281,6 @@ SQL } @test "sql-cherry-pick: commit with DROP TABLE" { - skip # drop or rename case dolt sql -q "DROP TABLE test" dolt commit -am "Drop table test" @@ -294,7 +293,7 @@ SQL run dolt sql -q "CALL DOLT_CHERRY_PICK('branch1')" [ "$status" -eq "1" ] - [[ "$output" =~ "table was renamed or dropped" ]] || false + [[ "$output" =~ "table was modified in one branch and deleted in the other" ]] || false run dolt sql -q "SHOW TABLES" -r csv [[ "$output" =~ "test" ]] || false