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.

Sign up for GitHub

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

Jump to bottom

Bump chainlink-testing-framework and integration-tests stability fixes #551

Merged
merged 1 commit into from
Oct 14, 2023
Merged

Bump chainlink-testing-framework and integration-tests stability fixes #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions integration-tests/common/test_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,6 @@ func (m *OCRv2TestState) DeployCluster(contractsDir string) {
require.NoError(m.T, err)
env, err = b.Build()
require.NoError(m.T, err)
m.T.Cleanup(func() {
if err := env.Cleanup(m.T); err != nil {
m.L.Error().Err(err).Msg("Error cleaning up test environment")
}
})
m.Common.DockerEnv = &SolCLClusterTestEnv{
CLClusterTestEnv: env,
Sol: sol,
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/docker/test_env/sol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (s *Solana) StartContainer() error {
return fmt.Errorf("cannot start Solana container: %w", err)
}
s.Container = c
host, err := c.Host(context.Background())
host, err := test_env.GetHost(context.Background(), c)
if err != nil {
return err
}
Expand Down
45 changes: 22 additions & 23 deletions integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ require (
github.com/onsi/gomega v1.27.8
github.com/rs/zerolog v1.30.0
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
github.com/smartcontractkit/chainlink-env v0.38.1
github.com/smartcontractkit/chainlink-env v0.38.3
github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231003135342-5e581164f8dd
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca
github.com/smartcontractkit/chainlink-testing-framework v1.17.6
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231005125809-5d088a57e308
github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231010203454-896f5c3c04d1
github.com/smartcontractkit/chainlink-testing-framework v1.17.11
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20231013224133-0c20ec70b3f9
github.com/smartcontractkit/chainlink/v2 v2.5.1-0.20230929172251-55c7baa1181a
github.com/smartcontractkit/libocr v0.0.0-20230922131214-122accb19ea6
github.com/stretchr/testify v1.8.4
github.com/testcontainers/testcontainers-go v0.23.0
go.uber.org/zap v1.25.0
golang.org/x/crypto v0.13.0
golang.org/x/sync v0.3.0
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.14.0
golang.org/x/sync v0.4.0
gopkg.in/guregu/null.v4 v4.0.0
)

Expand Down Expand Up @@ -59,7 +59,6 @@ require (
github.com/aws/aws-sdk-go v1.44.302 // indirect
github.com/aws/constructs-go/constructs/v10 v10.1.255 // indirect
github.com/aws/jsii-runtime-go v1.75.0 // indirect
github.com/benbjohnson/clock v1.3.4 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
github.com/blendle/zapdriver v1.3.1 // indirect
Expand Down Expand Up @@ -187,8 +186,8 @@ require (
github.com/grafana/dskit v0.0.0-20230201083518-528d8a7d52f2 // indirect
github.com/grafana/loki v1.6.2-0.20230403212622-90888a0cc737 // indirect
github.com/grafana/loki/pkg/push v0.0.0-20230127102416-571f88bc5765 // indirect
github.com/grafana/pyroscope-go v1.0.2 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.3 // indirect
github.com/grafana/pyroscope-go v1.0.4 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.4 // indirect
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
Expand Down Expand Up @@ -245,7 +244,7 @@ require (
github.com/json-iterator/go v1.1.12 // indirect
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/kelseyhightower/envconfig v1.4.0 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/koron/go-ssdp v0.0.2 // indirect
github.com/kr/pretty v0.3.1 // indirect
Expand Down Expand Up @@ -349,12 +348,12 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/alertmanager v0.25.1 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/exporter-toolkit v0.10.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/prometheus v0.46.0 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
Expand All @@ -366,7 +365,7 @@ require (
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
github.com/sercand/kuberesolver v2.4.0+incompatible // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/shirou/gopsutil/v3 v3.23.8 // indirect
github.com/shirou/gopsutil/v3 v3.23.9 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/slack-go/slack v0.12.2 // indirect
Expand Down Expand Up @@ -431,10 +430,10 @@ require (
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.starlark.net v0.0.0-20220817180228-f738f5508c12 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/goleak v1.2.1 // indirect
Expand All @@ -443,14 +442,14 @@ require (
golang.org/x/arch v0.4.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/mod v0.13.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/term v0.12.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.11.0 // indirect
golang.org/x/tools v0.14.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
gonum.org/v1/gonum v0.13.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
Loading
Loading