mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-13 11:09:10 -05:00
Code Issues Packages Projects Releases 146 Wiki Activity

Re-enabled skipped tests.

Browse Source
This commit is contained in:
Nick Tobey
2023-11-21 14:10:24 -08:00
parent f8e2371d24
commit b3943e5397
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
go/libraries/doltcore/merge/schema_merge_test.go
View File

@@ -254,7 +254,6 @@ var columnAddDropTests = []schemaMergeTest{
left: singleRow(1, 2),
right: singleRow(1, 3, nil),
dataConflict: true,
skip: true,
},
{
// Skipped because the differ doesn't see left as modified because
@@ -265,7 +264,6 @@ var columnAddDropTests = []schemaMergeTest{
left: singleRow(1, 2),
right: singleRow(1, 2, 3),
dataConflict: true,
skip: true,
},
{
name: "one side sets to non-NULL, other drops NULL, plus data change",
@@ -383,7 +381,6 @@ var columnAddDropTests = []schemaMergeTest{
left: singleRow(1, 2, nil),
right: singleRow(1, 2, 3),
dataConflict: true,
skip: true,
},
{
name: "convergent adds with differing nullness, plus convergent data change",