Skip to content

Commit

Permalink
Fix testify dep to avoid conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
erwinvaneyk committed Feb 21, 2018
1 parent b8d3fec commit a799ce0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
10 changes: 5 additions & 5 deletions glide.lock

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

2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@ import:
- graph/simple
testImport:
- package: github.com/stretchr/testify
version: ^1.1.4
version: 1.1.4
subpackages:
- assert
5 changes: 5 additions & 0 deletions test/runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,10 @@

set -e

# Install test dependencies if requested
if [ -z "$1" ]; then
go test -v -i $(go list ./... | grep -v '/vendor/')
fi

# Run unit and integration tests, exclude dependencies
go test -race -v $(go list ./... | grep -v '/vendor/')

0 comments on commit a799ce0

Please sign in to comment.