Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dbless): handle unexpected types when flattening errors #10952

Merged
merged 4 commits into from
May 26, 2023

Conversation

flrgh
Copy link
Contributor

@flrgh flrgh commented May 26, 2023

This is a bugfix backport of #10896.

@flrgh flrgh requested a review from gszr May 26, 2023 18:41
@flrgh flrgh marked this pull request as draft May 26, 2023 18:51
@flrgh
Copy link
Contributor Author

flrgh commented May 26, 2023

argh, not ready yet (git is hard)

@flrgh flrgh force-pushed the backport-10896-to-release/3.3.x branch from 0ff3c53 to a1b774a Compare May 26, 2023 18:56
@flrgh flrgh marked this pull request as ready for review May 26, 2023 18:57
@flrgh flrgh force-pushed the backport-10896-to-release/3.3.x branch from a1b774a to 63a14a8 Compare May 26, 2023 19:29
@flrgh
Copy link
Contributor Author

flrgh commented May 26, 2023

note: changes since last approval were just to fix a test/assertion compatibility thing. I squashed it into the first commit (because that's where it should go, but here's the diff:

diff --git spec/02-integration/04-admin_api/15-off_spec.lua spec/02-integration/04-admin_api/15-off_spec.lua
index fd99d1d5bd..e7fe91a9fe 100644
--- spec/02-integration/04-admin_api/15-off_spec.lua
+++ spec/02-integration/04-admin_api/15-off_spec.lua
@@ -1096,11 +1096,11 @@ describe("Admin API #off /config [flattened errors]", function()
       helpers.intercept(body)
     end

-    assert.logfile().has.no.line("[emerg]", true, 0)
-    assert.logfile().has.no.line("[crit]",  true, 0)
-    assert.logfile().has.no.line("[alert]", true, 0)
-    assert.logfile().has.no.line("[error]", true, 0)
-    assert.logfile().has.no.line("[warn]",  true, 0)
+    assert.logfile().has.no.line("[emerg]", true, 0.01)
+    assert.logfile().has.no.line("[crit]",  true, 0.01)
+    assert.logfile().has.no.line("[alert]", true, 0.01)
+    assert.logfile().has.no.line("[error]", true, 0.01)
+    assert.logfile().has.no.line("[warn]",  true, 0.01)

     return errors
   end

@flrgh flrgh merged commit aabf308 into release/3.3.x May 26, 2023
@flrgh flrgh deleted the backport-10896-to-release/3.3.x branch May 26, 2023 20:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants