Update go dependencies (#2234)

This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-03-23 13:35:19 -03:00 committed by GitHub
parent 6e099c5f57
commit 93c72ef646
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1236 changed files with 37226 additions and 49844 deletions

View file

@ -654,6 +654,21 @@ mergingIntList:
ExpectedError: "doesn't match",
},
},
{
Description: "missing merge key should error out",
StrategicMergePatchRawTestCaseData: StrategicMergePatchRawTestCaseData{
Original: []byte(`
mergingList:
- name: 1
value: a
`),
TwoWay: []byte(`
mergingList:
- value: b
`),
ExpectedError: "does not contain declared merge key",
},
},
}
func TestCustomStrategicMergePatch(t *testing.T) {