Skip to content

fix: tolerate golden error property orders#8126

Merged
erights merged 1 commit intomasterfrom
markm-tolerate-golden-error-prop-order
Aug 2, 2023
Merged

fix: tolerate golden error property orders#8126
erights merged 1 commit intomasterfrom
markm-tolerate-golden-error-prop-order

Conversation

@erights
Copy link
Copy Markdown
Member

@erights erights commented Aug 1, 2023

endojs/endo#1678 is now merged into endo. It ensures the property order seen in error message is in sorted order. That fix breaks goldens using non-sorted orders, which are inherently fragile anyway. But agoric-sdk currently depends on an endo prior to endojs/endo#1678 .

Specifically for those tests that would be broken by endojs/endo#1678 , this PR changes them to be tolerant of being in sorted order or not.

#8055 is just like this PR but tested against "current" endo master. If both are green under CI, then this PR should prepare agoric-sdk for that upgrade without breaking it in the meantime.

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Aug 1, 2023

⚠️ The sha of the head commit of this PR conflicts with #8055. Mergify cannot evaluate rules on this PR. ⚠️

@erights erights changed the title Markm tolerate golden error prop order fix: tolerate golden error prop order Aug 1, 2023
@erights erights changed the title fix: tolerate golden error prop order fix: tolerate golden error property orders Aug 1, 2023
@erights erights force-pushed the markm-tolerate-golden-error-prop-order branch from 15e550a to 9f69167 Compare August 1, 2023 05:14
@erights erights requested review from dckc and michaelfig August 1, 2023 05:25
@erights erights force-pushed the markm-tolerate-golden-error-prop-order branch from 9f69167 to eff597d Compare August 1, 2023 05:46
Copy link
Copy Markdown
Member

@michaelfig michaelfig left a comment

Choose a reason for hiding this comment

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

Not sure why CI is failing. Can you get it to green?

@erights
Copy link
Copy Markdown
Member Author

erights commented Aug 1, 2023

Not sure why CI is failing. Can you get it to green?

Still trying.

Copy link
Copy Markdown
Member

@michaelfig michaelfig left a comment

Choose a reason for hiding this comment

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

LGTM!

@erights erights force-pushed the markm-tolerate-golden-error-prop-order branch from 40d1ff5 to ae6682d Compare August 1, 2023 23:12
@erights erights force-pushed the markm-tolerate-golden-error-prop-order branch from ae6682d to 7a32cad Compare August 2, 2023 01:11
@erights erights enabled auto-merge August 2, 2023 01:15
@erights erights added this pull request to the merge queue Aug 2, 2023
Merged via the queue into master with commit f20cc05 Aug 2, 2023
@erights erights deleted the markm-tolerate-golden-error-prop-order branch August 2, 2023 02:07
mhofman pushed a commit that referenced this pull request Aug 7, 2023
…-order

fix: tolerate golden error property orders
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.

3 participants