Skip to content

Commit

Permalink
vendor: Replace glide with golang/dep (#100)
Browse files Browse the repository at this point in the history
  • Loading branch information
arekkas committed Nov 26, 2017
1 parent b6cb198 commit 0c237ab
Show file tree
Hide file tree
Showing 7 changed files with 198 additions and 151 deletions.
15 changes: 5 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,14 @@ services:
- docker

go:
- 1.7
- 1.8
- tip

matrix:
allow_failures:
- go: tip
- 1.9

install:
- go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover github.com/Masterminds/glide
- glide install
- go get github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/pierrre/gotestcover
- curl -L -s https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o $GOPATH/bin/dep && chmod +x $GOPATH/bin/dep
- dep ensure -vendor-only

script:
- go vet -x .
- gotestcover -coverprofile="cover.out" -race -covermode="count" .
- gotestcover -coverprofile="cover.out" -race -covermode="atomic" .
- goveralls -coverprofile="cover.out"
146 changes: 146 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"


[[constraint]]
name = "github.com/cenk/backoff"
version = "1.1.0"

[[constraint]]
name = "github.com/fsouza/go-dockerclient"
version = "1.1"

[[constraint]]
name = "github.com/go-sql-driver/mysql"
version = "1.3.0"

[[constraint]]
branch = "master"
name = "github.com/lib/pq"

[[constraint]]
name = "github.com/pkg/errors"
version = "0.8.0"

[[constraint]]
name = "github.com/stretchr/testify"
version = "1.1.4"
3 changes: 1 addition & 2 deletions dockertest.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ import (
"fmt"
"os"
"runtime"
"time"

"strings"
"time"

"github.com/cenk/backoff"
dc "github.com/fsouza/go-dockerclient"
Expand Down
17 changes: 0 additions & 17 deletions dockertest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"os"
"testing"

_ "github.com/go-sql-driver/mysql"
_ "github.com/lib/pq"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand All @@ -26,22 +25,6 @@ func TestMain(m *testing.M) {
os.Exit(m.Run())
}

func TestMySQL(t *testing.T) {
resource, err := pool.Run("mysql", "5.6", []string{"MYSQL_ROOT_PASSWORD=secret"})
require.Nil(t, err)
assert.NotEmpty(t, resource.GetPort("3306/tcp"))

err = pool.Retry(func() error {
db, err := sql.Open("mysql", fmt.Sprintf("root:secret@(localhost:%s)/mysql", resource.GetPort("3306/tcp")))
if err != nil {
return err
}
return db.Ping()
})
require.Nil(t, err)
require.Nil(t, pool.Purge(resource))
}

func TestPostgres(t *testing.T) {
resource, err := pool.Run("postgres", "9.5", nil)
require.Nil(t, err)
Expand Down
96 changes: 0 additions & 96 deletions glide.lock

This file was deleted.

26 changes: 0 additions & 26 deletions glide.yaml

This file was deleted.

0 comments on commit 0c237ab

Please sign in to comment.