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 610950fd2f..7e02df5bed 100644 Binary files a/integration-tests/bats/json-oldformat-repo/.dolt/noms/journal.idx and b/integration-tests/bats/json-oldformat-repo/.dolt/noms/journal.idx differ 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