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

Check for error returned in channel msg_tests (backport #5492) #5527

Merged
merged 2 commits into from
Jan 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2024

This is an automatic backport of pull request #5492 done by Mergify.
Cherry-pick of f51d062 has failed:

On branch mergify/bp/release/v8.1.x/pr-5492
Your branch is up to date with 'origin/release/v8.1.x'.

You are currently cherry-picking commit f51d0622.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   modules/core/04-channel/types/msgs_test.go

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* update test for MsgChannelOpenInit

* update test for MsgChannelOpenTry

* Use error as expError.

* update TestMsgChannelOpenAckValidateBasic

* update TestMsgChannelOpenConfirmValidateBasic

* update TestMsgChannelCloseInitValidateBasic and TestMsgChannelCloseConfirmValidateBasic

* update TestMsgRecvPacketValidateBasic

* update TestMsgTimeoutValidateBasic

* update TestMsgTimeoutOnCloseValidateBasic, TestMsgAcknowledgementValidateBasic, TestMsgChannelUpgradeInitValidateBasic, TestMsgChannelUpgradeTryValidateBasic

* update TestMsgChannelUpgradeAckValidateBasic, TestMsgChannelUpgradeConfirmValidateBasic

* update TestMsgChannelUpgradeOpenValidateBasic and TestMsgChannelUpgradeTimeoutValidateBasic

* update TestMsgChannelUpgradeCancelValidateBasic

* review comment

* reorder test cases

* remove unnecessary expPass variables

---------

Co-authored-by: DimitrisJim <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>
(cherry picked from commit f51d062)

# Conflicts:
#	modules/core/04-channel/types/msgs_test.go
Copy link
Contributor

@crodriguezvega crodriguezvega left a comment

Choose a reason for hiding this comment

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

Thank you for fixing the conflicts, @charleenfei. :)

@crodriguezvega crodriguezvega merged commit 55fc9fc into release/v8.1.x Jan 5, 2024
19 checks passed
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v8.1.x/pr-5492 branch January 5, 2024 22:43
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