Merge branch 'zachmu/enginetests' of github.com:dolthub/dolt into zac…

…hmu/enginetests

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

@@ -2046,4 +2046,4 @@ func TestStatsAutoRefreshConcurrency(t *testing.T) {
 
 		wg.Wait()
 	}
-}
+}

go/libraries/doltcore/sqle/enginetest/dolt_engine_tests.go

@@ -22,12 +22,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
-	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
-	"github.com/dolthub/dolt/go/libraries/doltcore/sqle"
-	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
-	"github.com/dolthub/dolt/go/store/datas"
-	"github.com/dolthub/dolt/go/store/types"
 	"github.com/dolthub/go-mysql-server/enginetest"
 	"github.com/dolthub/go-mysql-server/enginetest/queries"
 	"github.com/dolthub/go-mysql-server/enginetest/scriptgen/setup"
@@ -40,6 +34,13 @@ import (
 	"github.com/dolthub/vitess/go/mysql"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
+	"github.com/dolthub/dolt/go/libraries/doltcore/schema"
+	"github.com/dolthub/dolt/go/libraries/doltcore/sqle"
+	"github.com/dolthub/dolt/go/libraries/doltcore/sqle/dsess"
+	"github.com/dolthub/dolt/go/store/datas"
+	"github.com/dolthub/dolt/go/store/types"
 )
 
 const skipPreparedFlag = "DOLT_SKIP_PREPARED_ENGINETESTS"
@@ -1611,11 +1612,11 @@ func RunAddDropPrimaryKeysTests(t *testing.T, harness DoltEnginetestHarness) {
 					Query: "show create table test",
 					Expected: []sql.Row{
 						{"test", "CREATE TABLE `test` (\n" +
-								"  `id` int NOT NULL,\n" +
-								"  `c1` int,\n" +
-								"  PRIMARY KEY (`id`),\n" +
-								"  KEY `c1_idx` (`c1`)\n" +
-								") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
+							"  `id` int NOT NULL,\n" +
+							"  `c1` int,\n" +
+							"  PRIMARY KEY (`id`),\n" +
+							"  KEY `c1_idx` (`c1`)\n" +
+							") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
 					},
 				},
 			},
@@ -1661,12 +1662,12 @@ func RunAddDropPrimaryKeysTests(t *testing.T, harness DoltEnginetestHarness) {
 					Query: "show create table test",
 					Expected: []sql.Row{
 						{"test", "CREATE TABLE `test` (\n" +
-								"  `id` int NOT NULL,\n" +
-								"  `c1` int,\n" +
-								"  PRIMARY KEY (`id`),\n" +
-								"  KEY `c1_idx` (`c1`),\n" +
-								"  CONSTRAINT `test_check` CHECK ((`c1` > 0))\n" +
-								") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
+							"  `id` int NOT NULL,\n" +
+							"  `c1` int,\n" +
+							"  PRIMARY KEY (`id`),\n" +
+							"  KEY `c1_idx` (`c1`),\n" +
+							"  CONSTRAINT `test_check` CHECK ((`c1` > 0))\n" +
+							") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
 					},
 				},
 				{
@@ -1738,10 +1739,10 @@ func RunAddDropPrimaryKeysTests(t *testing.T, harness DoltEnginetestHarness) {
 					Query: "show create table test",
 					Expected: []sql.Row{
 						{"test", "CREATE TABLE `test` (\n" +
-								"  `id` int NOT NULL,\n" +
-								"  `c1` int,\n" +
-								"  KEY `c1_idx` (`c1`)\n" +
-								") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
+							"  `id` int NOT NULL,\n" +
+							"  `c1` int,\n" +
+							"  KEY `c1_idx` (`c1`)\n" +
+							") ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_bin"},
 					},
 				},
 				{
@@ -1942,4 +1943,3 @@ func RunDoltReflogTestsPrepared(t *testing.T, h DoltEnginetestHarness) {
 		}()
 	}
 }
-

go/libraries/doltcore/sqle/enginetest/dolt_harness.go

@@ -89,28 +89,28 @@ type DoltEnginetestHarness interface {
 	enginetest.KeylessTableHarness
 	enginetest.ReadOnlyDatabaseHarness
 	enginetest.ValidatingHarness
-	
+
 	// NewHarness returns a new uninitialized harness of the same type
 	NewHarness(t *testing.T) DoltEnginetestHarness
-	
+
 	// WithSkippedQueries returns a copy of the harness with the given queries skipped
 	WithSkippedQueries(skipped []string) DoltEnginetestHarness
-	
+
 	// WithParallelism returns a copy of the harness with parallelism set to the given number of threads
 	WithParallelism(parallelism int) DoltEnginetestHarness
-	
+
 	// WithConfigureStats returns a copy of the harness with the given configureStats value
 	WithConfigureStats(configureStats bool) DoltEnginetestHarness
 
 	// SkipSetupCommit configures to harness to skip the commit after setup scripts are run
 	SkipSetupCommit()
-	
+
 	// UseLocalFileSystem configures the harness to use the local filesystem for all storage, instead of in-memory versions
 	UseLocalFileSystem()
 
 	// Close closes the harness, freeing up any resources it may have allocated
 	Close()
-	
+
 	Engine() *gms.Engine
 
 	Session() *dsess.DoltSession

go/libraries/doltcore/sqle/enginetest/dolt_server_tests.go

@@ -22,16 +22,17 @@ import (
 	"testing"
 	"time"
 
-	"github.com/dolthub/dolt/go/cmd/dolt/commands/sqlserver"
-	"github.com/dolthub/dolt/go/libraries/doltcore/dtestutils"
-	"github.com/dolthub/dolt/go/libraries/doltcore/env"
-	"github.com/dolthub/dolt/go/libraries/doltcore/servercfg"
-	"github.com/dolthub/dolt/go/libraries/utils/svcs"
 	"github.com/dolthub/go-mysql-server/enginetest/queries"
 	"github.com/dolthub/go-mysql-server/sql"
 	"github.com/gocraft/dbr/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/dolthub/dolt/go/cmd/dolt/commands/sqlserver"
+	"github.com/dolthub/dolt/go/libraries/doltcore/dtestutils"
+	"github.com/dolthub/dolt/go/libraries/doltcore/env"
+	"github.com/dolthub/dolt/go/libraries/doltcore/servercfg"
+	"github.com/dolthub/dolt/go/libraries/utils/svcs"
 )
 
 // DoltBranchMultiSessionScriptTests contain tests that need to be run in a multi-session server environment
@@ -680,4 +681,3 @@ func testMultiSessionScriptTests(t *testing.T, tests []queries.ScriptTest) {
 		})
 	}
 }
-