Merge integration-tests Folder #1159
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kalverra
requested review from
jasonmci,
anirudhwarrier,
davidcauchi,
AnieeG and
b-gopalswami
AnieeG
requested changes
Jul 8, 2024
| @@ -1,15 +1,12 @@ | |||
| module github.com/smartcontractkit/ccip/integration-tests | |||
| module github.com/smartcontractkit/chainlink/integration-tests | |||
| @@ -505,6 +501,4 @@ replace ( | |||
|
|
|||
| // type func(a Label, b Label) bool of func(a, b Label) bool {…} does not match inferred type func(a Label, b Label) int for func(a E, b E) int | |||
| github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510 | |||
|
|
|||
| github.com/smartcontractkit/chainlink/integration-tests => ../integration-tests | |||
| @@ -728,7 +685,7 @@ func TeardownSuite( | |||
| l.Warn().Msgf("Error deleting jobs %+v", err) | |||
| } | |||
|
|
|||
| if chainlinkNodes != nil && chainClient != nil { | |||
| if chainlinkNodes != nil { | |||
| @@ -740,29 +697,6 @@ func TeardownSuite( | |||
| } else { | |||
| l.Info().Msg("Successfully returned funds from chainlink nodes to default network wallets") | |||
| } | |||
| // The following is needed for tests using EVMClient, | |||
| @@ -667,45 +664,6 @@ func ConfigureOCRv2AggregatorContracts( | |||
| return nil | |||
| } | |||
|
|
|||
| // ReturnFunds attempts to return all the funds from the chainlink nodes to the network's default address | |||
| @@ -10,7 +10,7 @@ import ( | |||
| "github.com/spf13/cobra" | |||
| "github.com/testcontainers/testcontainers-go" | |||
|
|
|||
| "github.com/smartcontractkit/ccip/integration-tests/docker/cmd/internal" | |||
| "github.com/smartcontractkit/chainlink/integration-tests/docker/cmd/internal" | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Solution