Fix Ginkgo entries in Godeps.json. (#29402)

Godeps/Godeps.json

@@ -1473,173 +1473,173 @@
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/config",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/ginkgo",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/ginkgo/convert",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/ginkgo/interrupthandler",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/ginkgo/nodot",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/ginkgo/testrunner",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/ginkgo/testsuite",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/ginkgo/watch",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/codelocation",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/containernode",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/failer",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/leafnodes",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/remote",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/spec",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/specrunner",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/suite",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/testingtproxy",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/internal/writer",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/reporters",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/reporters/stenographer",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo/types",
-			"Comment": "v1.2.0-60-g7d32401",
+			"Comment": "v1.2.0-66-g74c678d",
-			"Rev": "7d3240191d7b2311b60090fcbc96e56bffc45ec0"
+			"Rev": "74c678d97c305753605c338c6c78c49ec104b5e7"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/format",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/internal/assertion",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/internal/asyncassertion",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/internal/oraclematcher",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/internal/testingtsupport",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/matchers",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/matchers/support/goraph/bipartitegraph",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/matchers/support/goraph/edge",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/matchers/support/goraph/node",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/matchers/support/goraph/util",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega/types",
-			"Comment": "v1.0-91-g7ce781e",
+			"Comment": "v1.0-115-g9ed8da1",
-			"Rev": "7ce781ea776b2fd506491011353bded2e40c8467"
+			"Rev": "9ed8da19f2156b87a803a8fdf6d126f627a12db1"
 		},
 		{
 			"ImportPath": "github.com/opencontainers/runc/libcontainer",

vendor/github.com/onsi/gomega/.travis.yml

@@ -1,7 +1,8 @@
 language: go
 go:
   - 1.5
-  - tip
+  - 1.6.2
+  - stable
 
 install:
   - go get -v ./...

vendor/github.com/onsi/gomega/format/format.go

@@ -261,16 +261,3 @@ func isNilValue(a reflect.Value) bool {
 
 	return false
 }
-
-func isNil(a interface{}) bool {
-	if a == nil {
-		return true
-	}
-
-	switch reflect.TypeOf(a).Kind() {
-	case reflect.Chan, reflect.Func, reflect.Interface, reflect.Map, reflect.Ptr, reflect.Slice:
-		return reflect.ValueOf(a).IsNil()
-	}
-
-	return false
-}

vendor/github.com/onsi/gomega/matchers.go

@@ -214,6 +214,15 @@ func MatchJSON(json interface{}) types.GomegaMatcher {
 	}
 }
 
+//MatchYAML succeeds if actual is a string or stringer of YAML that matches
+//the expected YAML.  The YAML's are decoded and the resulting objects are compared via
+//reflect.DeepEqual so things like key-ordering and whitespace shouldn't matter.
+func MatchYAML(yaml interface{}) types.GomegaMatcher {
+	return &matchers.MatchYAMLMatcher{
+		YAMLToMatch: yaml,
+	}
+}
+
 //BeEmpty succeeds if actual is empty.  Actual must be of type string, array, map, chan, or slice.
 func BeEmpty() types.GomegaMatcher {
 	return &matchers.BeEmptyMatcher{}

vendor/github.com/onsi/gomega/matchers/match_yaml_matcher.go

@@ -0,0 +1,74 @@
+package matchers
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+
+	"github.com/onsi/gomega/format"
+	"gopkg.in/yaml.v2"
+)
+
+type MatchYAMLMatcher struct {
+	YAMLToMatch interface{}
+}
+
+func (matcher *MatchYAMLMatcher) Match(actual interface{}) (success bool, err error) {
+	actualString, expectedString, err := matcher.toStrings(actual)
+	if err != nil {
+		return false, err
+	}
+
+	var aval interface{}
+	var eval interface{}
+
+	if err := yaml.Unmarshal([]byte(actualString), &aval); err != nil {
+		return false, fmt.Errorf("Actual '%s' should be valid YAML, but it is not.\nUnderlying error:%s", actualString, err)
+	}
+	if err := yaml.Unmarshal([]byte(expectedString), &eval); err != nil {
+		return false, fmt.Errorf("Expected '%s' should be valid YAML, but it is not.\nUnderlying error:%s", expectedString, err)
+	}
+
+	return reflect.DeepEqual(aval, eval), nil
+}
+
+func (matcher *MatchYAMLMatcher) FailureMessage(actual interface{}) (message string) {
+	actualString, expectedString, _ := matcher.toNormalisedStrings(actual)
+	return format.Message(actualString, "to match YAML of", expectedString)
+}
+
+func (matcher *MatchYAMLMatcher) NegatedFailureMessage(actual interface{}) (message string) {
+	actualString, expectedString, _ := matcher.toNormalisedStrings(actual)
+	return format.Message(actualString, "not to match YAML of", expectedString)
+}
+
+func (matcher *MatchYAMLMatcher) toNormalisedStrings(actual interface{}) (actualFormatted, expectedFormatted string, err error) {
+	actualString, expectedString, err := matcher.toStrings(actual)
+	return normalise(actualString), normalise(expectedString), err
+}
+
+func normalise(input string) string {
+	var val interface{}
+	err := yaml.Unmarshal([]byte(input), &val)
+	if err != nil {
+		panic(err) // guarded by Match
+	}
+	output, err := yaml.Marshal(val)
+	if err != nil {
+		panic(err) // guarded by Unmarshal
+	}
+	return strings.TrimSpace(string(output))
+}
+
+func (matcher *MatchYAMLMatcher) toStrings(actual interface{}) (actualFormatted, expectedFormatted string, err error) {
+	actualString, ok := toString(actual)
+	if !ok {
+		return "", "", fmt.Errorf("MatchYAMLMatcher matcher requires a string, stringer, or []byte.  Got actual:\n%s", format.Object(actual, 1))
+	}
+	expectedString, ok := toString(matcher.YAMLToMatch)
+	if !ok {
+		return "", "", fmt.Errorf("MatchYAMLMatcher matcher requires a string, stringer, or []byte.  Got expected:\n%s", format.Object(matcher.YAMLToMatch, 1))
+	}
+
+	return actualString, expectedString, nil
+}