Merge pull request #3621 from dolthub/andy/unskip-dolt-1-enginetests

[no-release-notes] Delete enginetest skip methods

go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go

@@ -685,7 +685,6 @@ 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 +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) {
-	skipNewFormat(t)
-
+	if types.IsFormat_DOLT_1(types.Format_Default) {
+		t.Skip()
+	}
 	for _, script := range AppendViolationsAbortOnConflictsMergeScripts {
 		enginetest.TestScript(t, newDoltHarness(t), script)
 	}
@@ -1198,12 +1198,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")

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
 }
 

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",

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",