From a7191b81631d406f34eac1f419830c8bd1366e80 Mon Sep 17 00:00:00 2001 From: Andy Arthur Date: Wed, 15 Jun 2022 09:53:10 -0700 Subject: [PATCH 1/5] unskipping more enginetests --- .../doltcore/sqle/enginetest/dolt_engine_test.go | 13 +------------ .../doltcore/sqle/enginetest/dolt_harness.go | 16 ---------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index aca86877a0..7337be1953 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -682,10 +682,6 @@ func TestDoltMerge(t *testing.T) { // eventually this will be part of TestDoltMerge func TestDoltMergeArtifacts(t *testing.T) { - if !types.IsFormat_DOLT_1(types.Format_Default) { - t.Skip() - } - for _, script := range MergeViolationsAndConflictsMergeScripts { enginetest.TestScript(t, newDoltHarness(t), script) } @@ -694,8 +690,7 @@ func TestDoltMergeArtifacts(t *testing.T) { // these tests are temporary while there is a difference between the old format // and new format merge behaviors. func TestDoltMergeAbortOnConflictsAppendViolations(t *testing.T) { - skipNewFormat(t) - + t.Skip() for _, script := range AppendViolationsAbortOnConflictsMergeScripts { enginetest.TestScript(t, newDoltHarness(t), script) } @@ -1198,12 +1193,6 @@ var newFormatSkippedScripts = []string{ "Multiple indexes on the same columns in a different order", } -func skipNewFormat(t *testing.T) { - if types.IsFormat_DOLT_1(types.Format_Default) { - t.Skip() - } -} - func skipPreparedTests(t *testing.T) { if skipPrepared { t.Skip("skip prepared") diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_harness.go b/go/libraries/doltcore/sqle/enginetest/dolt_harness.go index 043347f7a6..84373c6d3e 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_harness.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_harness.go @@ -91,13 +91,6 @@ func newDoltHarness(t *testing.T) *DoltHarness { createdEnvs: make(map[string]*env.DoltEnv), } - if types.IsFormat_DOLT_1(dEnv.DoltDB.Format()) { - dh = dh.WithSkippedQueries([]string{ - "SHOW CREATE TABLE child", // todo(andy): "TestForeignKeys - ALTER TABLE RENAME COLUMN" - "typestable", - }) - } - return dh } @@ -276,15 +269,6 @@ func (d *DoltHarness) SupportsNativeIndexCreation() bool { } func (d *DoltHarness) SupportsForeignKeys() bool { - var firstEnv *env.DoltEnv - d.multiRepoEnv.Iter(func(name string, dEnv *env.DoltEnv) (stop bool, err error) { - firstEnv = dEnv - return true, nil - }) - - if types.IsFormat_DOLT_1(firstEnv.DoltDB.Format()) { - return false - } return true } From 59f9b15c17992888f8919f3c54a4e467c5385c01 Mon Sep 17 00:00:00 2001 From: Andy Arthur Date: Wed, 15 Jun 2022 09:56:07 -0700 Subject: [PATCH 2/5] unskip sysbench enginetest --- go/libraries/doltcore/sqle/enginetest/sysbench_test.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/sysbench_test.go b/go/libraries/doltcore/sqle/enginetest/sysbench_test.go index 97c85cd18f..c211e59d12 100644 --- a/go/libraries/doltcore/sqle/enginetest/sysbench_test.go +++ b/go/libraries/doltcore/sqle/enginetest/sysbench_test.go @@ -21,15 +21,9 @@ import ( "github.com/dolthub/go-mysql-server/enginetest/queries" "github.com/dolthub/go-mysql-server/sql" "github.com/dolthub/go-mysql-server/sql/plan" - - "github.com/dolthub/dolt/go/store/types" ) func TestSysbenchTransactionCV(t *testing.T) { - if types.IsFormat_DOLT_1(types.Format_Default) { - t.Skip() - } - harness := newDoltHarness(t) enginetest.TestTransactionScript(t, harness, queries.TransactionTest{ Name: "Sysbench Transactions Shouldn't Cause Constraint Violations", From 451cf8543eeced4f826f8334d9d05122809d06ff Mon Sep 17 00:00:00 2001 From: Andy Arthur Date: Wed, 15 Jun 2022 09:59:05 -0700 Subject: [PATCH 3/5] unskipping dolt_transaction_commit_test --- .../enginetest/dolt_transaction_commit_test.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_transaction_commit_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_transaction_commit_test.go index 41f2d6ca8d..cb6d123c4a 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_transaction_commit_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_transaction_commit_test.go @@ -26,16 +26,11 @@ import ( "github.com/dolthub/dolt/go/libraries/doltcore/doltdb" "github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess" - "github.com/dolthub/dolt/go/store/types" ) // TODO: we need tests for manual DOLT_COMMIT as well, but that's difficult with the way that functions are resolved // in the engine. func TestDoltTransactionCommitOneClient(t *testing.T) { - if types.IsFormat_DOLT_1(types.Format_Default) { - t.Skip() - } - // In this test, we're setting only one client to match transaction commits to dolt commits. // Autocommit is disabled for the enabled client, as it's the recommended way to use this feature. harness := newDoltHarness(t) @@ -177,10 +172,6 @@ func TestDoltTransactionCommitOneClient(t *testing.T) { } func TestDoltTransactionCommitTwoClients(t *testing.T) { - if types.IsFormat_DOLT_1(types.Format_Default) { - t.Skip() - } - // In this test, we're setting both clients to match transaction commits to dolt commits. // Autocommit is disabled, as it's the recommended way to use this feature. harness := newDoltHarness(t) @@ -315,10 +306,6 @@ func TestDoltTransactionCommitTwoClients(t *testing.T) { } func TestDoltTransactionCommitAutocommit(t *testing.T) { - if types.IsFormat_DOLT_1(types.Format_Default) { - t.Skip() - } - // In this test, each insertion from both clients cause a commit as autocommit is enabled. // Not the recommended way to use the feature, but it's permitted. harness := newDoltHarness(t) @@ -399,10 +386,6 @@ func TestDoltTransactionCommitAutocommit(t *testing.T) { } func TestDoltTransactionCommitLateFkResolution(t *testing.T) { - if types.IsFormat_DOLT_1(types.Format_Default) { - t.Skip() - } - harness := newDoltHarness(t) enginetest.TestTransactionScript(t, harness, queries.TransactionTest{ Name: "delayed foreign key resolution with transaction commits", From fa75503bdc0e6815b141e8f37e568a71bd252a6a Mon Sep 17 00:00:00 2001 From: Andy Arthur Date: Wed, 15 Jun 2022 10:03:06 -0700 Subject: [PATCH 4/5] skipping Dhruv's merge artifact tests --- go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index 7337be1953..e72125b5cb 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -682,6 +682,7 @@ func TestDoltMerge(t *testing.T) { // eventually this will be part of TestDoltMerge func TestDoltMergeArtifacts(t *testing.T) { + t.Skip() for _, script := range MergeViolationsAndConflictsMergeScripts { enginetest.TestScript(t, newDoltHarness(t), script) } From 5803564b6d793fc2a19cf9526ae6d10ad2ef130f Mon Sep 17 00:00:00 2001 From: Andy Arthur Date: Wed, 15 Jun 2022 10:44:44 -0700 Subject: [PATCH 5/5] revert constraint violation skips --- go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go index e72125b5cb..d4253a000a 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go @@ -682,7 +682,9 @@ func TestDoltMerge(t *testing.T) { // eventually this will be part of TestDoltMerge func TestDoltMergeArtifacts(t *testing.T) { - t.Skip() + if !types.IsFormat_DOLT_1(types.Format_Default) { + t.Skip() + } for _, script := range MergeViolationsAndConflictsMergeScripts { enginetest.TestScript(t, newDoltHarness(t), script) } @@ -691,7 +693,9 @@ func TestDoltMergeArtifacts(t *testing.T) { // these tests are temporary while there is a difference between the old format // and new format merge behaviors. func TestDoltMergeAbortOnConflictsAppendViolations(t *testing.T) { - t.Skip() + if types.IsFormat_DOLT_1(types.Format_Default) { + t.Skip() + } for _, script := range AppendViolationsAbortOnConflictsMergeScripts { enginetest.TestScript(t, newDoltHarness(t), script) }