Skip to content

Commit

Permalink
Fixup tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
nicktobey committed Jan 23, 2025
1 parent e568a66 commit d0fb77f
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 45 deletions.
14 changes: 7 additions & 7 deletions go/libraries/doltcore/merge/schema_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -541,12 +541,12 @@ func newColTypeInfo(name string, tag uint64, typeInfo typeinfo.TypeInfo, partOfP
return c
}

func fkCollection(fks ...DoltDB(ctx).ForeignKey) *doltdb.ForeignKeyCollection {
fkc, err := doltdb.NewForeignKeyCollection(fks...)
if err != nil {
panic(err)
}
return fkc
func fkCollection(fks ...doltdb.ForeignKey) *doltdb.ForeignKeyCollection {
fkc, err := doltdb.NewForeignKeyCollection(fks...)
if err != nil {
panic(err)
}
return fkc
}

func testMergeSchemas(t *testing.T, test mergeSchemaTest) {
Expand All @@ -555,9 +555,9 @@ func testMergeSchemas(t *testing.T, test mergeSchemaTest) {
return
}

ctx := context.Background()
dEnv := dtestutils.CreateTestEnv()
defer dEnv.DoltDB(ctx).Close()
ctx := context.Background()

cliCtx, _ := commands.NewArgFreeCliContext(ctx, dEnv, dEnv.FS)

Expand Down
48 changes: 24 additions & 24 deletions go/libraries/doltcore/migrate/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,32 +226,32 @@ func runMigration(t *testing.T, ctx context.Context, preEnv *env.DoltEnv) (postE
}

func initTestMigrationDB(ctx context.Context) (*doltdb.DoltDB, error) {
var db datas.Database
storage := &chunks.MemoryStorage{}
cs := storage.NewViewWithFormat("__DOLT__")
vrw := types.NewValueStore(cs)
ns := tree.NewNodeStore(cs)
db = datas.NewTypesDatabase(vrw, ns)
var db datas.Database
storage := &chunks.MemoryStorage{}
cs := storage.NewViewWithFormat("__DOLT__")
vrw := types.NewValueStore(cs)
ns := tree.NewNodeStore(cs)
db = datas.NewTypesDatabase(vrw, ns)

name, email := "user", "[email protected]"
meta, err := datas.NewCommitMeta(name, email, "test migration")
if err != nil {
return nil, err
}
name, email := "user", "[email protected]"
meta, err := datas.NewCommitMeta(name, email, "test migration")
if err != nil {
return nil, err
}

rv, err := doltdb.EmptyRootValue(ctx, vrw, ns)
if err != nil {
return nil, err
}
rv, err := doltdb.EmptyRootValue(ctx, vrw, ns)
if err != nil {
return nil, err
}

ds, err := db.GetDataset(ctx, ref.NewInternalRef("migration").String())
if err != nil {
return nil, err
}
ds, err := db.GetDataset(ctx, ref.NewInternalRef("migration").String())
if err != nil {
return nil, err
}

_, err = db.Commit(ctx, ds, rv.NomsValue(), datas.CommitOptions{Meta: meta})
if err != nil {
return nil, err
}
return doltdb.DoltDB(ctx)FromCS(cs, ""), nil
_, err = db.Commit(ctx, ds, rv.NomsValue(), datas.CommitOptions{Meta: meta})
if err != nil {
return nil, err
}
return doltdb.DoltDBFromCS(cs, ""), nil
}
4 changes: 2 additions & 2 deletions go/libraries/doltcore/sqle/cluster/commithook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (

func TestCommitHookStartsNotCaughtUp(t *testing.T) {
srcEnv := dtestutils.CreateTestEnv()
ctx := context.Background()
t.Cleanup(func() {
srcEnv.DoltDB(ctx).Close()
})
Expand All @@ -35,8 +36,7 @@ func TestCommitHookStartsNotCaughtUp(t *testing.T) {
destEnv.DoltDB(ctx).Close()
})

hook := newCommitHook(logrus.StandardLogger(), "origin", "https://localhost:50051/mydb", "mydb", RolePrimary, func(context.Context) (*doltdb.DoltDB, error)
{
hook := newCommitHook(logrus.StandardLogger(), "origin", "https://localhost:50051/mydb", "mydb", RolePrimary, func(context.Context) (*doltdb.DoltDB, error) {
return destEnv.DoltDB(ctx), nil
}, srcEnv.DoltDB(ctx), t.TempDir())

Expand Down
23 changes: 12 additions & 11 deletions go/libraries/doltcore/sqle/database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,24 @@ func TestIsKeyFuncs(t *testing.T) {
}

func TestNeedsToReloadEvents(t *testing.T) {
ctx := context.Background()
dEnv := dtestutils.CreateTestEnv()
tmpDir, err := dEnv.TempTableFilesDir()
require.NoError(t, err)
opts := editor.Options{Deaf: dEnv.DbEaFactory(ctx), Tempdir: tmpDir}

timestamp := time.Now().Truncate(time.Minute).UTC()

db, err := NewDatabase(context.Background(), "dolt", dEnv.DbData(ctx), opts)
db, err := NewDatabase(ctx, "dolt", dEnv.DbData(ctx), opts)
require.NoError(t, err)

_, ctx, err := NewTestEngine(dEnv, context.Background(), db)
_, sqlCtx, err := NewTestEngine(dEnv, ctx, db)
require.NoError(t, err)

var token any

t.Run("empty schema table doesn't need to be reloaded", func(t *testing.T) {
needsReload, err := db.NeedsToReloadEvents(ctx, token)
needsReload, err := db.NeedsToReloadEvents(sqlCtx, token)
require.NoError(t, err)
assert.False(t, needsReload)
})
Expand All @@ -73,38 +74,38 @@ BEGIN
CALL archive_order_history(DATE_SUB(CURDATE(), INTERVAL 1 YEAR));
END`

err = db.addFragToSchemasTable(ctx, "event", "testEvent", eventDefn, timestamp, nil)
err = db.addFragToSchemasTable(sqlCtx, "event", "testEvent", eventDefn, timestamp, nil)
require.NoError(t, err)

t.Run("events need to be reloaded after addition", func(t *testing.T) {
needsReload, err := db.NeedsToReloadEvents(ctx, token)
needsReload, err := db.NeedsToReloadEvents(sqlCtx, token)
require.NoError(t, err)
assert.True(t, needsReload)
})

_, token, err = db.GetEvents(ctx)
_, token, err = db.GetEvents(sqlCtx)
require.NoError(t, err)

t.Run("events do not need to be reloaded after no change", func(t *testing.T) {
needsReload, err := db.NeedsToReloadEvents(ctx, token)
needsReload, err := db.NeedsToReloadEvents(sqlCtx, token)
require.NoError(t, err)
assert.False(t, needsReload)
})

err = db.dropFragFromSchemasTable(ctx, "event", "testEvent", nil)
err = db.dropFragFromSchemasTable(sqlCtx, "event", "testEvent", nil)
require.NoError(t, err)

t.Run("events need to be reloaded after dropping one", func(t *testing.T) {
needsReload, err := db.NeedsToReloadEvents(ctx, token)
needsReload, err := db.NeedsToReloadEvents(sqlCtx, token)
require.NoError(t, err)
assert.True(t, needsReload)
})

_, token, err = db.GetEvents(ctx)
_, token, err = db.GetEvents(sqlCtx)
require.NoError(t, err)

t.Run("events do not need to be reloaded after no change", func(t *testing.T) {
needsReload, err := db.NeedsToReloadEvents(ctx, token)
needsReload, err := db.NeedsToReloadEvents(sqlCtx, token)
require.NoError(t, err)
assert.False(t, needsReload)
})
Expand Down
2 changes: 1 addition & 1 deletion go/libraries/doltcore/sqle/sqlddl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -514,11 +514,11 @@ func TestAddColumn(t *testing.T) {

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctx := context.Background()
dEnv, err := CreateTestDatabase()
require.NoError(t, err)
defer dEnv.DoltDB(ctx).Close()

ctx := context.Background()
root, err := dEnv.WorkingRoot(ctx)
require.NoError(t, err)

Expand Down

0 comments on commit d0fb77f

Please sign in to comment.