From a803adbc9a6eb70ad3841c8e88cb0f74896a2b3d Mon Sep 17 00:00:00 2001 From: Stephanie You Date: Thu, 15 Jun 2023 17:17:08 -0700 Subject: [PATCH] fix schema merge test requiring non-nil cliCtx --- go/libraries/doltcore/merge/schema_integration_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/go/libraries/doltcore/merge/schema_integration_test.go b/go/libraries/doltcore/merge/schema_integration_test.go index 6e4752d0f8..d3c67b7f27 100644 --- a/go/libraries/doltcore/merge/schema_integration_test.go +++ b/go/libraries/doltcore/merge/schema_integration_test.go @@ -562,6 +562,8 @@ func testMergeSchemas(t *testing.T, test mergeSchemaTest) { defer dEnv.DoltDB.Close() ctx := context.Background() + cliCtx, _ := commands.NewArgFreeCliContext(ctx, dEnv) + for _, c := range setupCommon { exit := c.exec(t, ctx, dEnv) require.Equal(t, 0, exit) @@ -576,7 +578,7 @@ func testMergeSchemas(t *testing.T, test mergeSchemaTest) { require.Equal(t, 0, exitCode) // merge branches - exitCode = commands.MergeCmd{}.Exec(ctx, "merge", []string{"other"}, dEnv, nil) + exitCode = commands.MergeCmd{}.Exec(ctx, "merge", []string{"other"}, dEnv, cliCtx) assert.Equal(t, 0, exitCode) wr, err := dEnv.WorkingRoot(ctx)