x/ref: Remove verror.Is and verror.Equal
It's simpler to just use verror.ErrorID instead
MultiPart: 2/2
Change-Id: I12886abe7e7d6345186022b9127d45c6fff54ec6
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 974d061..8c75b0a 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -450,11 +450,7 @@
var result *vdl.Value
err = call.Finish(&result)
- // If err is nil and testCase.err is nil reflect.DeepEqual will return
- // false because the types are different. Because of this, we only use
- // reflect.DeepEqual if one of the values is non-nil. If both values
- // are nil, then we consider them equal.
- if (err != nil || testCase.err != nil) && !verror.Equal(err, testCase.err) {
+ if verror.ErrorID(err) != verror.ErrorID(testCase.err) {
t.Errorf("unexpected err: got %#v, expected %#v", err, testCase.err)
}
