reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #256 from squaremo/dont_splode

Browse Source 
Don't splode in error type checks if given nil
This commit is contained in:
rade committed 2014-12-01 14:34:02 +00:00
2 parents 89317a24ee 0764d7aaaf
commit a17425989e
1 file changed
+8 -2
Download Patch File Download Diff File Expand all files Collapse all files
nameserver/testing_utils.go
+8 -2
View File
@@ -18,15 +18,21 @@ func assertStatus(t *testing.T, got int, wanted int, desc string) {
}
func assertErrorInterface(t *testing.T, got interface{}, wanted interface{}, desc string) {
if got == nil {
t.Fatalf("Expected %s but got nil", reflect.TypeOf(wanted).Elem())
}
gotT, wantedT := reflect.TypeOf(got), reflect.TypeOf(wanted).Elem()
if !gotT.Implements(wantedT) {
t.Fatalf("Expected %s but got %s (%s)", wantedT.String(), gotT.String(), desc)
t.Fatalf("Expected %s but got %s (%s)", wantedT, gotT, desc)
}
}
func assertErrorType(t *testing.T, got interface{}, wanted interface{}, desc string) {
if got == nil {
t.Fatalf("Expected %s but got nil", reflect.TypeOf(wanted).Elem())
}
gotT, wantedT := reflect.TypeOf(got), reflect.TypeOf(wanted).Elem()
if gotT != wantedT {
t.Fatalf("Expected %s but got %s (%s)", wantedT.String(), gotT.String(), desc)
t.Fatalf("Expected %s but got %s (%s)", wantedT, gotT, desc)
}
}