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

revert constraint violation skips

Browse Source
This commit is contained in:
Andy Arthur
2022-06-15 10:44:44 -07:00
parent fa75503bdc
commit 5803564b6d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
go/libraries/doltcore/sqle/enginetest/dolt_engine_test.go
View File

@@ -682,7 +682,9 @@ func TestDoltMerge(t *testing.T) {
// eventually this will be part of TestDoltMerge
func TestDoltMergeArtifacts(t *testing.T) {
t.Skip()
if !types.IsFormat_DOLT_1(types.Format_Default) {
t.Skip()
}
for _, script := range MergeViolationsAndConflictsMergeScripts {
enginetest.TestScript(t, newDoltHarness(t), script)
}
@@ -691,7 +693,9 @@ func TestDoltMergeArtifacts(t *testing.T) {
// these tests are temporary while there is a difference between the old format
// and new format merge behaviors.
func TestDoltMergeAbortOnConflictsAppendViolations(t *testing.T) {
t.Skip()
if types.IsFormat_DOLT_1(types.Format_Default) {
t.Skip()
}
for _, script := range AppendViolationsAbortOnConflictsMergeScripts {
enginetest.TestScript(t, newDoltHarness(t), script)
}