Merge pull request #2742 from dolthub/zachmu/enginetests5

zachmu · web-flow · commit 8f8eaf9a697f · 2024-11-12T15:06:33.000-08:00
[no-release-notes] Actually skip write tests, rather than just logging a skip
diff --git a/enginetest/evaluation.go b/enginetest/evaluation.go
@@ -1106,11 +1106,11 @@ func RunWriteQueryTestWithEngine(t *testing.T, harness Harness, e QueryEngine, t
 	if sh, ok := harness.(SkippingHarness); ok {
 		if sh.SkipQueryTest(tt.WriteQuery) {
 			t.Logf("Skipping query %s", tt.WriteQuery)
-			return
+			t.Skip()
 		}
 		if sh.SkipQueryTest(tt.SelectQuery) {
 			t.Logf("Skipping query %s", tt.SelectQuery)
-			return
+			t.Skip()
 		}
 	}
 	ctx := NewContext(harness)

Original file line number	Diff line number	Diff line change
`@@ -1106,11 +1106,11 @@ func RunWriteQueryTestWithEngine(t *testing.T, harness Harness, e QueryEngine, t`
`1106`	`1106`	`if sh, ok := harness.(SkippingHarness); ok {`
`1107`	`1107`	`if sh.SkipQueryTest(tt.WriteQuery) {`
`1108`	`1108`	`t.Logf("Skipping query %s", tt.WriteQuery)`
`1109`		`- return`
	`1109`	`+ t.Skip()`
`1110`	`1110`	`}`
`1111`	`1111`	`if sh.SkipQueryTest(tt.SelectQuery) {`
`1112`	`1112`	`t.Logf("Skipping query %s", tt.SelectQuery)`
`1113`		`- return`
	`1113`	`+ t.Skip()`
`1114`	`1114`	`}`
`1115`	`1115`	`}`
`1116`	`1116`	`ctx := NewContext(harness)`