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

Decouple testing from app with an interface (backport #1397) #1408

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 17, 2023

This is an automatic backport of pull request #1397 done by Mergify.
Cherry-pick of 0337c35 has failed:

On branch mergify/bp/releases/v0.3x/pr-1397
Your branch is up to date with 'origin/releases/v0.3x'.

You are currently cherry-picking commit 0337c35f.
  (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)

Changes to be committed:
	new file:   app/test_support.go
	modified:   tests/e2e/ibc_fees_test.go
	modified:   x/wasm/ibc_integration_test.go
	modified:   x/wasm/ibctesting/coordinator.go
	modified:   x/wasm/ibctesting/event_utils.go
	modified:   x/wasm/ibctesting/faucet.go
	modified:   x/wasm/ibctesting/wasm.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   tests/e2e/gov_test.go
	both modified:   tests/e2e/ica_test.go
	both modified:   x/wasm/ibctesting/chain.go
	both modified:   x/wasm/ibctesting/endpoint.go
	both modified:   x/wasm/ibctesting/path.go
	both modified:   x/wasm/relay_pingpong_test.go
	both modified:   x/wasm/relay_test.go

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

(cherry picked from commit 0337c35)

# Conflicts:
#	tests/e2e/gov_test.go
#	tests/e2e/ica_test.go
#	x/wasm/ibctesting/chain.go
#	x/wasm/ibctesting/endpoint.go
#	x/wasm/ibctesting/path.go
#	x/wasm/relay_pingpong_test.go
#	x/wasm/relay_test.go
@mergify mergify bot requested a review from alpe as a code owner May 17, 2023 07:37
@mergify mergify bot added the conflicts label May 17, 2023
@pinosu
Copy link
Contributor

pinosu commented May 17, 2023

Closing because it is not relevant

@pinosu pinosu closed this May 17, 2023
@mergify mergify bot deleted the mergify/bp/releases/v0.3x/pr-1397 branch May 17, 2023 10:07
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