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 error handling in CheckGoldenJSONResponse #587

Merged
merged 3 commits into from Dec 14, 2022

Conversation

toddtreece
Copy link
Member

@toddtreece toddtreece commented Dec 14, 2022

What this PR does / why we need it:
Fixes an issue from #571 that prevents golden files from being created.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

@toddtreece toddtreece requested a review from a team as a code owner December 14, 2022 17:59
@toddtreece toddtreece requested review from wbrowne and marefr and removed request for a team December 14, 2022 17:59
@toddtreece toddtreece marked this pull request as draft December 14, 2022 17:59
@@ -209,13 +210,17 @@ func CheckGoldenJSONResponse(t *testing.T, dir string, name string, dr *backend.
fpath := path.Join(dir, name+".jsonc")

expected, err := readGoldenJSONFile(fpath)
assert.NoError(t, err)
if err != nil {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ryantxu this was causing issues for me when new tests were added. it would fail and there was no way to create the file

require.NoError(t, err)
return
}
require.NoError(t, err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe require.Fail would make the most sense to use here IE

require.Fail(t, "Error reading golden JSON file")

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added with 80ba379

@toddtreece toddtreece marked this pull request as ready for review December 14, 2022 19:35
@@ -36,5 +36,5 @@ Dimensions: 1 Fields by 3 Rows


====== TEST DATA RESPONSE (arrow base64) ======
FRAME=QVJST1cxAAD/////mAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAJwAAAADAAAAVAAAACgAAAAEAAAADP///wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAAs////CAAAABQAAAAJAAAARnJhbWUgT25lAAAABAAAAG5hbWUAAAAAVP///wgAAAAsAAAAIAAAAHsiY3VzdG9tIjp7InNvbWVWYWx1ZSI6InZhbHVlIn19AAAAAAQAAABtZXRhAAAAAAEAAAAYAAAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAIAAAACIAAAAAAAAA4gAAAACAAAAPAAAAAQAAADU////CAAAABgAAAAOAAAAU2luZ2xlIGZsb2F0NjQAAAQAAABuYW1lAAAAAAgADAAIAAQACAAAAAgAAAAcAAAAEgAAAHsidW5pdCI6IlBlcmNlbnQifQAABgAAAGNvbmZpZwAAAAAAAAAABgAIAAYABgAAAAAAAgAOAAAAU2luZ2xlIGZsb2F0NjQAAP////+IAAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAKAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAAOAAAAAUAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAAAAAAAAAAAABAAAABQAAAAAAAAAAAAAAAAAAAIXrUbgehSBAZmZmZmZmIUCkcD0K16MtQKRwPQrXIyRACtejcD0KIUAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAPAAAAAAAAwABAAAAqAEAAAAAAACQAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAwAAAAIAAQACgAAAAgAAACcAAAAAwAAAFQAAAAoAAAABAAAAAz///8IAAAADAAAAAAAAAAAAAAABQAAAHJlZklkAAAALP///wgAAAAUAAAACQAAAEZyYW1lIE9uZQAAAAQAAABuYW1lAAAAAFT///8IAAAALAAAACAAAAB7ImN1c3RvbSI6eyJzb21lVmFsdWUiOiJ2YWx1ZSJ9fQAAAAAEAAAAbWV0YQAAAAABAAAAGAAAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAACAAAAAiAAAAAAAAAOIAAAAAgAAADwAAAAEAAAA1P///wgAAAAYAAAADgAAAFNpbmdsZSBmbG9hdDY0AAAEAAAAbmFtZQAAAAAIAAwACAAEAAgAAAAIAAAAHAAAABIAAAB7InVuaXQiOiJQZXJjZW50In0AAAYAAABjb25maWcAAAAAAAAAAAYACAAGAAYAAAAAAAIADgAAAFNpbmdsZSBmbG9hdDY0AADIAQAAQVJST1cx
FRAME=QVJST1cxAAD/////gAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEDAAoADAAAAAgABAAKAAAACAAAAFgAAAACAAAAKAAAAAQAAAAg////CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAED///8IAAAAFAAAAAkAAABGcmFtZSBUd28AAAAEAAAAbmFtZQAAAAABAAAAGAAAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAACwAAAAtAAAAAAAAAWwAAAAAwAAAGgAAAA0AAAABAAAAKz///8IAAAAGAAAAA0AAABzaW5nbGUgc3RyaW5nAAAABAAAAG5hbWUAAAAA2P///wgAAAAUAAAACQAAAHsiYSI6ImIifQAAAAYAAABsYWJlbHMAAAgADAAIAAQACAAAAAgAAAAgAAAAFQAAAHsiZGlzcGxheU5hbWUiOiIxMjMifQAAAAYAAABjb25maWcAAAAAAAAEAAQABAAAAA0AAABzaW5nbGUgc3RyaW5nAAAAAAAAAP////+YAAAAFAAAAAAAAAAMABYAFAATAAwABAAMAAAAGAAAAAAAAAAUAAAAAAAAAwMACgAYAAwACAAEAAoAAAAUAAAASAAAAAMAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAABAAAAAAAAAACAAAAAAAAAAAAAAAAQAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAADAAAAYWJjAAAAAAAQAAAADAAUABIADAAIAAQADAAAABAAAAAsAAAAOAAAAAAAAwABAAAAkAEAAAAAAACgAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAAAAoADAAAAAgABAAKAAAACAAAAFgAAAACAAAAKAAAAAQAAAAg////CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAAED///8IAAAAFAAAAAkAAABGcmFtZSBUd28AAAAEAAAAbmFtZQAAAAABAAAAGAAAAAAAEgAYABQAAAATAAwAAAAIAAQAEgAAABQAAACwAAAAtAAAAAAAAAWwAAAAAwAAAGgAAAA0AAAABAAAAKz///8IAAAAGAAAAA0AAABzaW5nbGUgc3RyaW5nAAAABAAAAG5hbWUAAAAA2P///wgAAAAUAAAACQAAAHsiYSI6ImIifQAAAAYAAABsYWJlbHMAAAgADAAIAAQACAAAAAgAAAAgAAAAFQAAAHsiZGlzcGxheU5hbWUiOiIxMjMifQAAAAYAAABjb25maWcAAAAAAAAEAAQABAAAAA0AAABzaW5nbGUgc3RyaW5nAAAAqAEAAEFSUk9XMQ==
FRAME=QVJST1cxAAD/////kAEAABAAAAAAAAoADgAMAAsABAAKAAAAFAAAAAAAAAEEAAoADAAAAAgABAAKAAAACAAAAJwAAAADAAAAVAAAACgAAAAEAAAAFP///wgAAAAMAAAAAAAAAAAAAAAFAAAAcmVmSWQAAAA0////CAAAABQAAAAJAAAARnJhbWUgT25lAAAABAAAAG5hbWUAAAAAXP///wgAAAAsAAAAIAAAAHsiY3VzdG9tIjp7InNvbWVWYWx1ZSI6InZhbHVlIn19AAAAAAQAAABtZXRhAAAAAAEAAAAYAAAAAAASABgAFAAAABMADAAAAAgABAASAAAAFAAAAHgAAACAAAAAAAAAA4AAAAACAAAANAAAAAQAAADc////CAAAABAAAAAGAAAAbnVtYmVyAAAGAAAAdHN0eXBlAAAIAAwACAAEAAgAAAAIAAAAHAAAABIAAAB7InVuaXQiOiJQZXJjZW50In0AAAYAAABjb25maWcAAAAAAAAAAAYACAAGAAYAAAAAAAIADgAAAFNpbmdsZSBmbG9hdDY0AAD/////iAAAABQAAAAAAAAADAAWABQAEwAMAAQADAAAACgAAAAAAAAAFAAAAAAAAAMEAAoAGAAMAAgABAAKAAAAFAAAADgAAAAFAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAAQAAAAUAAAAAAAAAAAAAAAAAAACF61G4HoUgQGZmZmZmZiFApHA9CtejLUCkcD0K1yMkQArXo3A9CiFAEAAAAAwAFAASAAwACAAEAAwAAAAQAAAALAAAADwAAAAAAAQAAQAAAKABAAAAAAAAkAAAAAAAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAACgAMAAAACAAEAAoAAAAIAAAAnAAAAAMAAABUAAAAKAAAAAQAAAAU////CAAAAAwAAAAAAAAAAAAAAAUAAAByZWZJZAAAADT///8IAAAAFAAAAAkAAABGcmFtZSBPbmUAAAAEAAAAbmFtZQAAAABc////CAAAACwAAAAgAAAAeyJjdXN0b20iOnsic29tZVZhbHVlIjoidmFsdWUifX0AAAAABAAAAG1ldGEAAAAAAQAAABgAAAAAABIAGAAUAAAAEwAMAAAACAAEABIAAAAUAAAAeAAAAIAAAAAAAAADgAAAAAIAAAA0AAAABAAAANz///8IAAAAEAAAAAYAAABudW1iZXIAAAYAAAB0c3R5cGUAAAgADAAIAAQACAAAAAgAAAAcAAAAEgAAAHsidW5pdCI6IlBlcmNlbnQifQAABgAAAGNvbmZpZwAAAAAAAAAABgAIAAYABgAAAAAAAgAOAAAAU2luZ2xlIGZsb2F0NjQAAMABAABBUlJPVzE=
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are here because of #580

This is not required since the match is still valid, but seems better to have this in sync with what would be produced today

@toddtreece toddtreece merged commit e7064e9 into main Dec 14, 2022
@toddtreece toddtreece deleted the toddtreece/fix-json-golden-test-updates branch December 14, 2022 19:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants