more fixes

database/integration_test.go

@@ -894,8 +894,8 @@ func testJWKs(t *testing.T, db Interface, resources *Resources) {
 		t.Errorf("unable to list jwks: %v", err)
 	}
 
-	if diff := cmp.Diff(resources.JWKs, list); diff != "" {
-		t.Errorf("ListJWKs() mismatch (-want +got):\n%s", diff)
+	if !reflect.DeepEqual(resources.JWKs, list) {
+		t.Errorf("ListJWKs() mismatch, want %v, got %v", resources.JWKs, list)
 	}
 
 	methods["ListJWKs"] = true
@@ -910,7 +910,7 @@ func testJWKs(t *testing.T, db Interface, resources *Resources) {
 			t.Errorf("unable to get jwk %s: %v", jkPub.KeyID(), err)
 		}
 
-		if !cmp.Equal(jkPub, got, testutils.JwkOpts) {
+		if !cmp.Equal(jkPub, got, testutils.JwkKeyOpts) {
 			t.Errorf("GetJWK() is %v, want %v", got, jkPub)
 		}
 	}

database/jwk/get_test.go

@@ -79,7 +79,7 @@ func TestJWK_Engine_GetJWK(t *testing.T) {
 				t.Errorf("GetActiveJWK for %s returned err: %v", test.name, err)
 			}
 
-			if diff := cmp.Diff(test.want, got, testutils.JwkOpts); diff != "" {
+			if diff := cmp.Diff(test.want, got, testutils.JwkKeyOpts); diff != "" {
 				t.Errorf("GetActiveJWK mismatch (-want +got):\n%s", diff)
 			}
 		})

database/testutils/mock_args.go

@@ -38,7 +38,7 @@ func (t NowTimestamp) Match(v driver.Value) bool {
 	return now-ts < 10
 }
 
-var JwkOpts = cmp.Options{
+var JwkKeyOpts = cmp.Options{
 	cmp.FilterValues(func(x, y interface{}) bool {
 		_, xOk := x.(jwk.RSAPublicKey)
 		_, yOk := y.(jwk.RSAPublicKey)

go.mod

@@ -53,7 +53,6 @@ require (
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
-	github.com/stretchr/testify v1.9.0 // indirect
 )
 
 require (