Skip to content

Commit 0f0664a

Browse files
nickysemenzanickysemenza
authored
Merge pull request #1256 from thaJeztah/remove_testify
certdb/sql: remove uses of github.com/stretchr/testify/require
2 parents f0549e3 + 8d25f25 commit 0f0664a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+27
-23465
lines changed

‎certdb/sql/sql_test.go‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package sql
22

33
import (
44
"math"
5+
"reflect"
56
"testing"
67
"time"
78

89
"github.com/cloudflare/cfssl/certdb"
910
"github.com/cloudflare/cfssl/certdb/testdb"
1011

1112
"github.com/jmoiron/sqlx"
12-
"github.com/stretchr/testify/require"
1313
)
1414

1515
const (
@@ -95,8 +95,13 @@ func testInsertCertificateAndGetCertificate(ta TestAccessor, t *testing.T) {
9595
t.Errorf("want Certificate %+v, got %+v", want, got)
9696
}
9797
gotMeta, err := got.GetMetadata()
98-
require.NoError(t, err)
99-
require.Equal(t, map[string]interface{}{"k": "v"}, gotMeta)
98+
if err != nil {
99+
t.Fatal(err)
100+
}
101+
expected := map[string]interface{}{"k": "v"}
102+
if !reflect.DeepEqual(gotMeta, expected) {
103+
t.Fatalf("expected: %+v, got: %+v", expected, gotMeta)
104+
}
100105

101106
unexpired, err := ta.Accessor.GetUnexpiredCertificates()
102107

@@ -156,12 +161,19 @@ func testInsertCertificateAndGetUnexpiredCertificate(ta TestAccessor, t *testing
156161
}
157162

158163
unexpiredFiltered, err := ta.Accessor.GetUnexpiredCertificatesByLabel([]string{"foo"})
159-
require.NoError(t, err)
160-
require.Len(t, unexpiredFiltered, 1)
164+
if err != nil {
165+
t.Fatal(err)
166+
}
167+
if l := len(unexpiredFiltered); l != 1 {
168+
t.Error("Should have 1 unexpiredFiltered certificate record:", l)
169+
}
161170
unexpiredFiltered, err = ta.Accessor.GetUnexpiredCertificatesByLabel([]string{"bar"})
162-
require.NoError(t, err)
163-
require.Len(t, unexpiredFiltered, 0)
164-
171+
if err != nil {
172+
t.Fatal(err)
173+
}
174+
if l := len(unexpiredFiltered); l != 0 {
175+
t.Error("Should have 0 unexpiredFiltered certificate record:", l)
176+
}
165177
}
166178
func testInsertCertificateAndGetUnexpiredCertificateNullCommonName(ta TestAccessor, t *testing.T) {
167179
ta.Truncate()

‎go.mod‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ require (
1414
github.com/lib/pq v1.10.9
1515
github.com/mattn/go-sqlite3 v1.14.17
1616
github.com/prometheus/client_golang v1.16.0
17-
github.com/stretchr/testify v1.8.4
1817
github.com/zmap/zcrypto v0.0.0-20230310154051-c8b263fd8300
1918
github.com/zmap/zlint/v3 v3.5.0
2019
golang.org/x/crypto v0.10.0
@@ -23,24 +22,22 @@ require (
2322
require (
2423
github.com/beorn7/perks v1.0.1 // indirect
2524
github.com/cespare/xxhash/v2 v2.2.0 // indirect
26-
github.com/davecgh/go-spew v1.1.1 // indirect
2725
github.com/getsentry/sentry-go v0.11.0 // indirect
2826
github.com/go-logr/logr v1.2.3 // indirect
2927
github.com/golang/protobuf v1.5.3 // indirect
3028
github.com/kylelemons/go-gypsy v1.0.0 // indirect
3129
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
3230
github.com/pelletier/go-toml v1.9.3 // indirect
33-
github.com/pmezard/go-difflib v1.0.0 // indirect
3431
github.com/prometheus/client_model v0.4.0 // indirect
3532
github.com/prometheus/common v0.42.0 // indirect
3633
github.com/prometheus/procfs v0.10.1 // indirect
3734
github.com/rogpeppe/go-internal v1.10.0 // indirect
35+
github.com/stretchr/testify v1.8.4 // indirect
3836
github.com/weppos/publicsuffix-go v0.30.0 // indirect
3937
github.com/ziutek/mymysql v1.5.4 // indirect
4038
golang.org/x/net v0.10.0 // indirect
4139
golang.org/x/sys v0.9.0 // indirect
4240
golang.org/x/text v0.10.0 // indirect
4341
google.golang.org/protobuf v1.30.0 // indirect
44-
gopkg.in/yaml.v3 v3.0.1 // indirect
4542
k8s.io/klog/v2 v2.100.1 // indirect
4643
)

‎go.sum‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
702702
gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
703703
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
704704
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
705-
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
706705
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
707706
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
708707
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎signer/local/local_test.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ import (
3131
"github.com/cloudflare/cfssl/helpers"
3232
"github.com/cloudflare/cfssl/log"
3333
"github.com/cloudflare/cfssl/signer"
34-
"github.com/stretchr/testify/require"
35-
3634
ct "github.com/google/certificate-transparency-go"
3735
"github.com/zmap/zlint/v3/lint"
3836
)
@@ -1622,13 +1620,17 @@ func TestLint(t *testing.T) {
16221620
} else if err != nil && tc.expectedErr != nil {
16231621
actual := err.Error()
16241622
expected := tc.expectedErr.Error()
1625-
require.Equal(t, expected, actual)
1623+
if expected != actual {
1624+
t.Fatalf("expected: %v, got: %v", expected, actual)
1625+
}
16261626
if len(tc.expectedErrResults) > 0 {
16271627
le, ok := err.(*LintError)
16281628
if !ok {
16291629
t.Fatalf("expected LintError type err, got %v", err)
16301630
}
1631-
require.EqualValues(t, tc.expectedErrResults, le.ErrorResults)
1631+
if !reflect.DeepEqual(tc.expectedErrResults, le.ErrorResults) {
1632+
t.Fatalf("expected: %v, got: %v", tc.expectedErrResults, le.ErrorResults)
1633+
}
16321634
}
16331635
}
16341636
})

‎vendor/github.com/davecgh/go-spew/LICENSE‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎vendor/github.com/davecgh/go-spew/spew/bypass.go‎

Lines changed: 0 additions & 145 deletions
This file was deleted.

‎vendor/github.com/davecgh/go-spew/spew/bypasssafe.go‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)