Skip to content

Commit 29d63db

Browse files
author
James Cor
committed
skip warning tests on server engine
1 parent f753f92 commit 29d63db

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

enginetest/evaluation.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,18 @@ func TestScriptWithEngine(t *testing.T, e QueryEngine, harness Harness, script q
129129
} else if assertion.ExpectedErrStr != "" {
130130
AssertErrWithCtx(t, e, harness, ctx, assertion.Query, assertion.Bindings, nil, assertion.ExpectedErrStr)
131131
} else if assertion.ExpectedWarning != 0 {
132-
AssertWarningAndTestQuery(t, e, nil, harness, assertion.Query,
133-
assertion.Expected, nil, assertion.ExpectedWarning, assertion.ExpectedWarningsCount,
134-
assertion.ExpectedWarningMessageSubstring, assertion.SkipResultsCheck)
132+
if IsServerEngine(e) && assertion.SkipResultCheckOnServerEngine {
133+
t.Skip()
134+
}
135+
AssertWarningAndTestQuery(t, e, nil, harness,
136+
assertion.Query,
137+
assertion.Expected,
138+
nil,
139+
assertion.ExpectedWarning,
140+
assertion.ExpectedWarningsCount,
141+
assertion.ExpectedWarningMessageSubstring,
142+
assertion.SkipResultsCheck,
143+
)
135144
} else if assertion.SkipResultsCheck {
136145
RunQueryWithContext(t, e, harness, nil, assertion.Query)
137146
} else if assertion.CheckIndexedAccess {

enginetest/queries/script_queries.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ var ScriptTests = []ScriptTest{
350350
Expected: []sql.Row{{true}},
351351
},
352352
{
353-
// TODO: 123.456 is converted to a DECIMAL by Builder.ConvertVal, when it should be a DOUBLE
354-
Skip: true,
353+
// TODO: 123.456 is converted to a DECIMAL by Builder.ConvertVal, when it should be a
354+
SkipResultCheckOnServerEngine: true, // TODO: warnings do not make it to server engine
355355
Query: "SELECT '123.456ABC' = 123.456;",
356356
Expected: []sql.Row{{true}},
357357
ExpectedWarningsCount: 1,
@@ -456,6 +456,7 @@ var ScriptTests = []ScriptTest{
456456
},
457457
{
458458
// TODO: 123.456 is converted to a DECIMAL by Builder.ConvertVal, when it should be a DOUBLE
459+
SkipResultCheckOnServerEngine: true, // TODO: warnings do not make it to server engine
459460
Query: "SELECT '123.456ABC' in (123.456);",
460461
Expected: []sql.Row{{true}},
461462
ExpectedWarningsCount: 1,

0 commit comments

Comments
 (0)