Skip to content

Commit ca3ab4b

Browse files
committed
Merge pull request docker-archive#635 from LK4D4/vet_only_needed
Fix some suspicious things in vendor
2 parents 6029e23 + 76ed4ed commit ca3ab4b

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

hack/validate.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ validate() {
99
bash /go/src/github.com/docker/docker/hack/make/validate-dco
1010
bash /go/src/github.com/docker/docker/hack/make/validate-gofmt
1111
go get golang.org/x/tools/cmd/vet
12-
go vet github.com/docker/libcontainer/...
12+
bash /go/src/github.com/docker/docker/hack/make/validate-vet
1313
}
1414

1515
# run validations

update-vendor.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ clone git github.com/codegangsta/cli 1.1.0
4444
clone git github.com/coreos/go-systemd v2
4545
clone git github.com/godbus/dbus v2
4646
clone git github.com/Sirupsen/logrus v0.7.3
47-
clone git github.com/syndtr/gocapability 8e4cdcb
47+
clone git github.com/syndtr/gocapability 66ef2aa
4848
clone git github.com/golang/protobuf 655cdfa588ea
4949

5050
# intentionally not vendoring Docker itself... that'd be a circle :)

vendor/src/github.com/golang/protobuf/proto/all_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -1281,9 +1281,7 @@ func TestEnum(t *testing.T) {
12811281
// We don't care what the value actually is, just as long as it doesn't crash.
12821282
func TestPrintingNilEnumFields(t *testing.T) {
12831283
pb := new(GoEnum)
1284-
if fmt.Sprintf("%+v", pb) == "" {
1285-
t.Errorf("expected non-empty string")
1286-
}
1284+
fmt.Sprintf("%+v", pb)
12871285
}
12881286

12891287
// Verify that absent required fields cause Marshal/Unmarshal to return errors.

0 commit comments

Comments
 (0)