Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Godeps: update hashicorp/go-multierror #678

Merged
merged 2 commits into from
Jan 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Godeps/Godeps.json

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

10 changes: 5 additions & 5 deletions validate/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ func TestJSONSchema(t *testing.T) {
}{
{
config: &rspec.Spec{},
error: "1 error occurred:\n\n* Version string empty\nRefer to: https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#specification-version",
error: "1 error occurred:\n\t* Version string empty\nRefer to: https://github.com/opencontainers/runtime-spec/blob/v1.0.1/config.md#specification-version\n\n",
},
{
config: &rspec.Spec{
Expand Down Expand Up @@ -128,7 +128,7 @@ func TestJSONSchema(t *testing.T) {
},
},
},
error: "2 errors occurred:\n\n* linux.namespaces.0: Must validate at least one schema (anyOf)\n* linux.namespaces.0.type: linux.namespaces.0.type must be one of the following: \"mount\", \"pid\", \"network\", \"uts\", \"ipc\", \"user\", \"cgroup\"",
error: "2 errors occurred:\n\t* linux.namespaces.0: Must validate at least one schema (anyOf)\n\t* linux.namespaces.0.type: linux.namespaces.0.type must be one of the following: \"mount\", \"pid\", \"network\", \"uts\", \"ipc\", \"user\", \"cgroup\"\n\n",
},
{
config: &rspec.Spec{
Expand Down Expand Up @@ -716,11 +716,11 @@ func TestCheckMandatoryFields(t *testing.T) {
}{
{
config: &rspec.Spec{},
error: "1 error occurred:\n\n* 'Spec.Version' should not be empty",
error: "1 error occurred:\n\t* 'Spec.Version' should not be empty\n\n",
},
{
config: nil,
error: "1 error occurred:\n\n* Spec can't be nil",
error: "1 error occurred:\n\t* Spec can't be nil\n\n",
},
{
config: &rspec.Spec{
Expand All @@ -733,7 +733,7 @@ func TestCheckMandatoryFields(t *testing.T) {
Version: "1.0.0",
Root: &rspec.Root{},
},
error: "1 error occurred:\n\n* 'Root.Path' should not be empty",
error: "1 error occurred:\n\t* 'Root.Path' should not be empty\n\n",
},
} {
t.Run(tt.error, func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/hashicorp/go-multierror/.travis.yml

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

6 changes: 3 additions & 3 deletions vendor/github.com/hashicorp/go-multierror/format.go

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

3 changes: 3 additions & 0 deletions vendor/github.com/hashicorp/go-multierror/go.mod

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

4 changes: 4 additions & 0 deletions vendor/github.com/hashicorp/go-multierror/go.sum

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

4 changes: 2 additions & 2 deletions vendor/github.com/hashicorp/go-multierror/multierror.go

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

16 changes: 16 additions & 0 deletions vendor/github.com/hashicorp/go-multierror/sort.go

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