Switch from gpm -> dep for dependency management

openstandia · Nov 17, 2017 · c4905f2 · c4905f2
1 parent 363a0dd
commit c4905f2
Show file tree

Hide file tree

Showing 8 changed files with 182 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,10 @@
-google_auth_proxy
 oauth2_proxy
+vendor
+dist
+.godeps
+*.exe
+
+
 # Go.gitignore
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
@@ -22,9 +27,5 @@ _cgo_export.*
 
 _testmain.go
 
-*.exe
-dist
-.godeps
-
 # Editor swap/temp files
 .*.swp
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,11 @@
 language: go
 go:
-  - 1.7.5
-  - 1.8.1
+  - 1.8.x
+  - 1.9.x
 script:
-  - curl -s https://raw.githubusercontent.com/pote/gpm/v1.4.0/bin/gpm > gpm
-  - chmod +x gpm
-  - ./gpm install
+  - wget -O dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64
+  - chmod +x dep
+  - ./dep ensure
   - ./test.sh
 sudo: false
 notifications:

diff --git a/Godeps b/Godeps
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -0,0 +1,40 @@
+
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+
+[[constraint]]
+  name = "github.com/18F/hmacauth"
+  version = "~1.0.1"
+
+[[constraint]]
+  name = "github.com/BurntSushi/toml"
+  version = "~0.3.0"
+
+[[constraint]]
+  name = "github.com/bitly/go-simplejson"
+  version = "~0.5.0"
+
+[[constraint]]
+  branch = "v2"
+  name = "github.com/coreos/go-oidc"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/mreiferson/go-options"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  version = "~1.1.4"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/oauth2"
+
+[[constraint]]
+  branch = "master"
+  name = "google.golang.org/api"
+
+[[constraint]]
+  name = "gopkg.in/fsnotify.v1"
+  version = "~1.2.0"
diff --git a/test.sh b/test.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
-set -e
-
+EXIT_CODE=0
 echo "gofmt"
-diff -u <(echo -n) <(gofmt -d $(find . -type f -name '*.go' -not -path "./.godeps/*"))
-echo "go vet"
-go vet ./...
-echo "go test"
-go test -timeout 60s ./...
-echo "go test -race"
-GOMAXPROCS=4 go test -timeout 60s -race ./...
+diff -u <(echo -n) <(gofmt -d $(find . -type f -name '*.go' -not -path "./vendor/*")) || EXIT_CODE=1
+for pkg in $(go list ./... | grep -v '/vendor/' ); do
+    echo "testing $pkg"
+    echo "go vet $pkg"
+    go vet "$pkg" || EXIT_CODE=1
+    echo "go test -v $pkg"
+    go test -v -timeout 90s "$pkg" || EXIT_CODE=1
+    echo "go test -v -race $pkg"
+    GOMAXPROCS=4 go test -v -timeout 90s0s -race "$pkg" || EXIT_CODE=1
+done
+exit $EXIT_CODE
diff --git a/validator_test.go b/validator_test.go
@@ -20,7 +20,7 @@ func NewValidatorTest(t *testing.T) *ValidatorTest {
 	if err != nil {
 		t.Fatal("failed to create temp file: " + err.Error())
 	}
-	vt.done = make(chan bool)
+	vt.done = make(chan bool, 1)
 	return vt
 }
 

diff --git a/validator_watcher_test.go b/validator_watcher_test.go
@@ -86,7 +86,7 @@ func TestValidatorOverwriteEmailListViaRenameAndReplace(t *testing.T) {
 
 	vt.WriteEmails(t, []string{"xyzzy@example.com"})
 	domains := []string(nil)
-	updated := make(chan bool)
+	updated := make(chan bool, 1)
 	validator := vt.NewValidator(domains, updated)
 
 	if !validator("xyzzy@example.com") {