Skip to content

Commit cb71d57

Browse files
committed
Skip dolt_preview_merge_conflicts test
1 parent 8ee4513 commit cb71d57

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

testing/go/enginetest/doltgres_engine_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,6 +1217,7 @@ func TestViewsWithAsOfPrepared(t *testing.T) {
12171217
func TestDoltMerge(t *testing.T) {
12181218
h := newDoltgresServerHarness(t).WithSkippedQueries([]string{
12191219
"dolt_preview_merge_conflicts_summary(", // returns schema qualified table names
1220+
"dolt_preview_merge_conflicts(", // table not found: test
12201221
"keyless table merge with constraint violation on duplicate rows", // alter table
12211222
"CALL DOLT_MERGE without conflicts correctly works with autocommit off with commit flag", // datetime support
12221223
"CALL DOLT_MERGE without conflicts correctly works with autocommit off and no commit flag", // datetime support

0 commit comments

Comments
 (0)