From ce4744c9f71585a0433662565b71b0a6f2e6ab15 Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Wed, 16 Mar 2022 00:15:02 -0700 Subject: [PATCH] libraries/doltcore/dtestutils/testcommands: fix dropped errors --- .../doltcore/dtestutils/testcommands/multienv.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/go/libraries/doltcore/dtestutils/testcommands/multienv.go b/go/libraries/doltcore/dtestutils/testcommands/multienv.go index 99ca62d20e..d3641c9f12 100644 --- a/go/libraries/doltcore/dtestutils/testcommands/multienv.go +++ b/go/libraries/doltcore/dtestutils/testcommands/multienv.go @@ -169,6 +169,9 @@ func (mr *MultiRepoTestSetup) CloneDB(fromRemote, dbName string) { r := mr.GetRemote(fromRemote) srcDB, err := r.GetRemoteDB(ctx, types.Format_Default) + if err != nil { + mr.Errhand(err) + } dEnv := env.Load(context.Background(), mr.homeProv, filesys.LocalFS, doltdb.LocalDirDoltDB, "test") dEnv, err = actions.EnvForClone(ctx, srcDB.Format(), r, cloneDir, dEnv.FS, dEnv.Version, mr.homeProv) @@ -185,8 +188,12 @@ func (mr *MultiRepoTestSetup) CloneDB(fromRemote, dbName string) { if err != nil { mr.Errhand(err) } - os.Chdir(cloneDir) + err = os.Chdir(cloneDir) + if err != nil { + mr.Errhand(err) + } defer os.Chdir(wd) + ddb, err := doltdb.LoadDoltDB(ctx, types.Format_Default, doltdb.LocalDirDoltDB, filesys.LocalFS) if err != nil { mr.Errhand("Failed to initialize environment:" + err.Error()) @@ -236,7 +243,9 @@ func (mr *MultiRepoTestSetup) CommitWithWorkingSet(dbName string) *doltdb.Commit t := datas.CommitNowFunc() roots, err := dEnv.Roots(ctx) - + if err != nil { + panic("couldn't get roots: " + err.Error()) + } pendingCommit, err := actions.GetCommitStaged(ctx, roots, ws.MergeActive(), mergeParentCommits, dEnv.DbData(), actions.CommitStagedProps{ Message: "auto commit", Date: t, @@ -289,6 +298,9 @@ func (mr *MultiRepoTestSetup) StageAll(dbName string) { } roots, err = actions.StageAllTables(ctx, roots, dEnv.Docs) + if err != nil { + mr.Errhand(fmt.Sprintf("Failed to stage tables: %s", dbName)) + } err = dEnv.UpdateRoots(ctx, roots) if err != nil { mr.Errhand(fmt.Sprintf("Failed to update roots: %s", dbName))