Skip to content

Commit

Permalink
Moved to the upstream goconvey repo from the forked one
Browse files Browse the repository at this point in the history
Even though upstream doesn't have tag support, we can get the same
behavior by using the upstream and using `-run`.
  • Loading branch information
sgnn7 committed Feb 4, 2019
1 parent d1e4b33 commit ffffb13
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -8,7 +8,7 @@ RUN apk add --no-cache bash \
jq \
less
RUN go get -u github.com/jstemmer/go-junit-report
RUN go get github.com/playscale/goconvey
RUN go get github.com/smartystreets/goconvey

RUN mkdir -p /summon-conjur/output
WORKDIR /summon-conjur
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -5,8 +5,8 @@ require (
github.com/cyberark/conjur-api-go v0.5.1
github.com/jtolds/gls v4.2.1+incompatible // indirect
github.com/karrick/golf v1.1.0
github.com/playscale/goconvey v0.0.0-20170315071757-c5c320a61665
github.com/sirupsen/logrus v1.3.0
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 // indirect
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c
gopkg.in/yaml.v2 v2.2.2 // indirect
)
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -9,13 +9,13 @@ github.com/karrick/golf v1.1.0 h1:pW5IaAZlmRaq2TVHp1ct0XouZw206+wSL+ifUF6fnp8=
github.com/karrick/golf v1.1.0/go.mod h1:qGN0IhcEL+IEgCXp00RvH32UP59vtwc8w5YcIdArNRk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/playscale/goconvey v0.0.0-20170315071757-c5c320a61665 h1:FFwlJXh0Gnm+73FxA124agffV01li72mMgqwJqWzJJg=
github.com/playscale/goconvey v0.0.0-20170315071757-c5c320a61665/go.mod h1:7Uk/NK0w6TKSCYo9qCNw9AS+sAJYVGVKFfqYQyf4aww=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME=
github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w=
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I=
Expand Down
2 changes: 1 addition & 1 deletion package_enterprise_test.go
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"testing"

. "github.com/playscale/goconvey/convey"
. "github.com/smartystreets/goconvey/convey"
)

func TestPackageEnterprise(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion package_oss_test.go
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/cyberark/conjur-api-go/conjurapi"
conjur_authn "github.com/cyberark/conjur-api-go/conjurapi/authn"
. "github.com/playscale/goconvey/convey"
. "github.com/smartystreets/goconvey/convey"
)

func TestPackageOSS(t *testing.T) {
Expand Down

0 comments on commit ffffb13

Please sign in to comment.