mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-08 11:21:17 -05:00
Code Issues Packages Projects Releases 163 Wiki Activity

fix schema merge test requiring non-nil cliCtx

Browse Source
This commit is contained in:
Stephanie You
2023-06-15 17:17:08 -07:00
parent 6e4726fded
commit a803adbc9a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/merge/schema_integration_test.go
+3 -1
View File
@@ -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)