More test fixes

dolthub · Sep 11, 2024 · a9e1dd6 · a9e1dd6
1 parent aa887c8
commit a9e1dd6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/go/libraries/doltcore/merge/schema_integration_test.go b/go/libraries/doltcore/merge/schema_integration_test.go
@@ -631,7 +631,7 @@ func testMergeSchemasWithConflicts(t *testing.T, test mergeSchemaConflictTest) {
 
 	otherSch := getSchema(t, dEnv)
 
-	_, actConflicts, mergeInfo, _, err := merge.SchemaMerge(context.Background(), types.Format_Default, mainSch, otherSch, ancSch, "test")
+	_, actConflicts, mergeInfo, _, err := merge.SchemaMerge(context.Background(), types.Format_Default, mainSch, otherSch, ancSch, doltdb.TableName{Name: "test"})
 	assert.False(t, mergeInfo.InvalidateSecondaryIndexes)
 	if test.expectedErr != nil {
 		// We don't use errors.Is here because errors generated by `Kind.New` compare stack traces in their `Is` implementation.
@@ -640,7 +640,7 @@ func testMergeSchemasWithConflicts(t *testing.T, test mergeSchemaConflictTest) {
 	}
 
 	require.NoError(t, err)
-	assert.Equal(t, actConflicts.TableName, "test")
+	assert.Equal(t, actConflicts.TableName.Name, "test")
 
 	assert.Equal(t, test.expConflict.Count(), actConflicts.Count())