weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix more unit tests

Browse Source 
Signed-off-by: Maartje Eyskens <maartje@eyskens.me>
This commit is contained in:
Maartje Eyskens 2020-06-05 16:12:48 +02:00 committed by James Munnelly
parent ca5361d79d
commit fe02661386
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/issuer/venafi/client/request_test.go
View File

@ -120,9 +120,9 @@ func TestSign(t *testing.T) {
tests := map[string]testSignT{
"if reading the zone configuration fails then error": {
csrPEM: csrPEM,
checkFn: checkNoCertificateIssued,
expectedErr: true,
csrPEM: csrPEM,
checkFn: checkNoCertificateIssued,
expectedRequestErr: true,
client: internalfake.Connector{
ReadZoneConfigurationFunc: func() (*endpoint.ZoneConfiguration, error) {
return nil, errors.New("zone configuration error")
@ -130,9 +130,9 @@ func TestSign(t *testing.T) {
}.Default(),
},
"if validating the certificate fails then error": {
csrPEM: csrPEM,
checkFn: checkNoCertificateIssued,
expectedErr: true,
csrPEM: csrPEM,
checkFn: checkNoCertificateIssued,
expectedRequestErr: true,
client: internalfake.Connector{
ReadZoneConfigurationFunc: func() (*endpoint.ZoneConfiguration, error) {
return &endpoint.ZoneConfiguration{
@ -144,9 +144,9 @@ func TestSign(t *testing.T) {
}.Default(),
},
"a badly formed CSR should error": {
csrPEM: []byte("a badly formed CSR"),
checkFn: checkNoCertificateIssued,
expectedErr: true,
csrPEM: []byte("a badly formed CSR"),
checkFn: checkNoCertificateIssued,
expectedRequestErr: true,
},
"a CSR wiuth empty DN sshould error": {
csrPEM: csrPEMNoDN,
@ -160,8 +160,8 @@ func TestSign(t *testing.T) {
return "", errors.New("request error")
},
}.Default(),
checkFn: checkNoCertificateIssued,
expectedErr: true,
checkFn: checkNoCertificateIssued,
expectedRequestErr: true,
},
"if retrieve certificate fails, sign should error": {
csrPEM: csrPEM,
@ -174,9 +174,9 @@ func TestSign(t *testing.T) {
expectedErr: true,
},
"if no Common Name, DNS Name, or URI SANs in CSR then error": {
csrPEM: csrNonePEM,
checkFn: checkNoCertificateIssued,
expectedErr: true,
csrPEM: csrNonePEM,
checkFn: checkNoCertificateIssued,
expectedRequestErr: true,
},
"obtain a certificate with DNS names specified": {
csrPEM: csrPEM,
@ -208,10 +208,10 @@ func TestSign(t *testing.T) {
expectedErr: false,
},
"If invalid custom field type found the error": {
csrPEM: csrPEM,
customFields: []api.CustomField{{Name: "test", Value: "ok", Type: "Bool"}},
checkFn: checkNoCertificateIssued,
expectedErr: true,
csrPEM: csrPEM,
customFields: []api.CustomField{{Name: "test", Value: "ok", Type: "Bool"}},
checkFn: checkNoCertificateIssued,
expectedRequestErr: true,
},
}
@ -252,6 +252,11 @@ func (s *testSignT) runTest(t *testing.T) {
t.Errorf("expected to get an error but did not get one")
}
if err != nil {
// do not call RetreiveCertificate if RequestCertificate failed
return
}
resp, err := v.RetreiveCertificate(pickupID, s.csrPEM, time.Minute, s.customFields)
if err != nil && !s.expectedErr {
t.Errorf("expected to not get an error, but got: %v", err)