mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-03 10:08:59 -06:00
Code Issues Packages Projects Releases 141 Wiki Activity

Merge pull request #3001 from alrs/testcommands-errs

Browse Source 
libraries/doltcore/dtestutils/testcommands: fix dropped errors
This commit is contained in:
Zach Musgrave
2022-03-16 16:39:27 -05:00
committed by GitHub
parent c94c33d037 ce4744c9f7
commit 7b680c86a0
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
go/libraries/doltcore/dtestutils/testcommands/multienv.go
View File

@@ -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))