Merge branch 'main' into ci/golangci-goimports

steebchen · Nov 5, 2023 · b2cc51a · b2cc51a
2 parents 5f381f5 + 6919def
commit b2cc51a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/test/databases/sqlite/checks_nested/default_test.go b/test/databases/sqlite/checks_nested/default_test.go
@@ -1,4 +1,8 @@
-package raw
+//go:build e2e
+// +build e2e
+
+// package db is only tested in e2e mode as it might conflict when running locally
+package db
 
 import (
 	"context"

diff --git a/test/databases/sqlite/checks_path/default_test.go b/test/databases/sqlite/checks_path/default_test.go
@@ -1,3 +1,7 @@
+//go:build e2e
+// +build e2e
+
+// package db is only tested in e2e mode as it might conflict when running locally
 package db
 
 import (

diff --git a/test/test.go b/test/test.go
@@ -39,6 +39,7 @@ var Databases = []Database{
 const schemaTemplate = "schema.temp.%s.prisma"
 
 func Migrate(t *testing.T, db Database, e engine.Engine, mockDB string) {
+	t.Helper()
 	schemaPath := fmt.Sprintf(schemaTemplate, db.Name())
 
 	xe := e.(*engine.QueryEngine)
@@ -59,6 +60,8 @@ func Migrate(t *testing.T, db Database, e engine.Engine, mockDB string) {
 }
 
 func Start(t *testing.T, db Database, e engine.Engine, queries []string) string {
+	t.Helper()
+
 	mockDB := db.SetupDatabase(t)
 	Migrate(t, db, e, mockDB)
 
@@ -91,6 +94,8 @@ func Start(t *testing.T, db Database, e engine.Engine, queries []string) string
 }
 
 func End(t *testing.T, db Database, e engine.Engine, mockDBName string) {
+	t.Helper()
+
 	defer Teardown(t, db, mockDBName)
 
 	if err := e.Disconnect(); err != nil {