Skip to content

Commit

Permalink
integration-tests: use stretchr/testify intead of legacy test-go (#335)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmank88 authored May 1, 2023
1 parent 2055092 commit 837a920
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
3 changes: 2 additions & 1 deletion integration-tests/common/test_common.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package common
import (
"testing"

"github.com/stretchr/testify/require"

ctfClient "github.com/smartcontractkit/chainlink-testing-framework/client"
"github.com/smartcontractkit/chainlink/integration-tests/client"
"github.com/test-go/testify/require"

"github.com/smartcontractkit/chainlink-cosmos/ops/gauntlet"
)
Expand Down
6 changes: 1 addition & 5 deletions integration-tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/smartcontractkit/chainlink-env v0.3.29
github.com/smartcontractkit/chainlink-testing-framework v1.11.5
github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20230418232145-9b83bdc20e8a
github.com/test-go/testify v1.1.4
github.com/stretchr/testify v1.8.2
go.uber.org/zap v1.24.0
)

Expand Down Expand Up @@ -282,7 +282,6 @@ require (
github.com/spf13/viper v1.14.0 // indirect
github.com/status-im/keycard-go v0.2.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/testify v1.8.2 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
github.com/tendermint/btcd v0.1.1 // indirect
Expand Down Expand Up @@ -371,15 +370,12 @@ replace (

github.com/prometheus/common => github.com/prometheus/common v0.10.0

github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0

// Make sure we're working with the latest ops
github.com/smartcontractkit/chainlink-cosmos/ops => ../ops

github.com/smartcontractkit/chainlink/v2 => github.com/smartcontractkit/chainlink/v2 v2.0.0-20230418232145-9b83bdc20e8a

// The Loki - Grafana - Prometheus - Cortex stack is all sorts of wack
github.com/weaveworks/common => github.com/weaveworks/common v0.0.0-20200625145055-4b1847531bc9
google.golang.org/grpc => google.golang.org/grpc v1.29.1

// K8s imports are weird
Expand Down
3 changes: 2 additions & 1 deletion integration-tests/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1260,8 +1260,9 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b h1:gQZ0qzfKHQIybLANtM3mBXNUtOfsCFXeTsnBqCsx1KM=
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
github.com/scylladb/go-reflectx v1.0.1 h1:b917wZM7189pZdlND9PbIJ6NQxfDPfBvUaQ7cjj1iZQ=
github.com/scylladb/go-reflectx v1.0.1/go.mod h1:rWnOfDIRWBGN0miMLIcoPt/Dhi2doCMZqwMCJ3KupFc=
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/smoke/ocr2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"testing"

"github.com/test-go/testify/require"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zapcore"

"github.com/smartcontractkit/chainlink-cosmos/integration-tests/common"
Expand Down

0 comments on commit 837a920

Please sign in to comment.