From 6585cf0147442c580326e701467fa03f2e1db3b1 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 16 Jun 2015 09:44:57 -0700 Subject: [PATCH 1/2] Use validate-vet script from docker It tests only changed files from commit. We can't expect vet fixes from all projects from vendor directory. Signed-off-by: Alexander Morozov --- hack/validate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/validate.sh b/hack/validate.sh index 4e0ccce7..3c170545 100755 --- a/hack/validate.sh +++ b/hack/validate.sh @@ -9,7 +9,7 @@ validate() { bash /go/src/github.com/docker/docker/hack/make/validate-dco bash /go/src/github.com/docker/docker/hack/make/validate-gofmt go get golang.org/x/tools/cmd/vet - go vet github.com/docker/libcontainer/... + bash /go/src/github.com/docker/docker/hack/make/validate-vet } # run validations From 76ed4ed758a28f0a1f7e117641e135cbdf640f31 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Tue, 16 Jun 2015 09:59:40 -0700 Subject: [PATCH 2/2] Fix suspicious places in vendor Signed-off-by: Alexander Morozov --- update-vendor.sh | 2 +- vendor/src/github.com/golang/protobuf/proto/all_test.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/update-vendor.sh b/update-vendor.sh index 69ed4cde..69b6e50c 100755 --- a/update-vendor.sh +++ b/update-vendor.sh @@ -44,7 +44,7 @@ clone git github.com/codegangsta/cli 1.1.0 clone git github.com/coreos/go-systemd v2 clone git github.com/godbus/dbus v2 clone git github.com/Sirupsen/logrus v0.7.3 -clone git github.com/syndtr/gocapability 8e4cdcb +clone git github.com/syndtr/gocapability 66ef2aa clone git github.com/golang/protobuf 655cdfa588ea # intentionally not vendoring Docker itself... that'd be a circle :) diff --git a/vendor/src/github.com/golang/protobuf/proto/all_test.go b/vendor/src/github.com/golang/protobuf/proto/all_test.go index 2bfdb1c5..8784187c 100644 --- a/vendor/src/github.com/golang/protobuf/proto/all_test.go +++ b/vendor/src/github.com/golang/protobuf/proto/all_test.go @@ -1281,9 +1281,7 @@ func TestEnum(t *testing.T) { // We don't care what the value actually is, just as long as it doesn't crash. func TestPrintingNilEnumFields(t *testing.T) { pb := new(GoEnum) - if fmt.Sprintf("%+v", pb) == "" { - t.Errorf("expected non-empty string") - } + fmt.Sprintf("%+v", pb) } // Verify that absent required fields cause Marshal/Unmarshal to return errors.