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

Review implementations

Browse Source 
Signed-off-by: Haoxiang Zhou <haoxiang.zhou@jetstack.io>
This commit is contained in:
Haoxiang Zhou 2020-07-21 15:57:02 +01:00
parent 2ae27cb86f
commit f061f15e93
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/ctl/pkg/create/certificaterequest/certificaterequest_test.go
View File

@ -80,22 +80,21 @@ func TestValidate(t *testing.T) {
InputFilename: test.inputFile,
KeyFilename: test.keyFilename,
CertFileName: test.certFilename,
FetchCert: test.fetchCert,
}
// Validating args and flags
err := opts.Validate(test.inputArgs)
if err != nil {
if !test.expErr {
t.Errorf("got unexpected error when validating args and flags: %v", err)
} else if err.Error() != test.expErrMsg {
t.Errorf("got unexpected error when validating args and flags, expected: %v; actual: %v", test.expErrMsg, err)
t.Fatalf("got unexpected error when validating args and flags: %v", err)
}
return
} else {
if err.Error() != test.expErrMsg {
t.Fatalf("got unexpected error when validating args and flags, expected: %v; actual: %v", test.expErrMsg, err)
}
} else if test.expErr {
// got no error
if test.expErr {
t.Errorf("expected but got no error validating args and flags")
}
t.Errorf("expected but got no error validating args and flags")
}
})
}

25
test/integration/ctl/ctl_create_cr_test.go
View File

@ -22,6 +22,7 @@ import (
"fmt"
"io/ioutil"
"os"
"path"
"testing"
"time"
@ -80,7 +81,7 @@ func TestCtlCreateCRBehaviourBeforeAnythingIsCreated(t *testing.T) {
tests := map[string]CreateCRTest{
"conflicting namespaces defined in flag and file": {
inputFile: testdataPath + "create_cr_cert_with_ns1.yaml",
inputFile: path.Join(testdataPath, "create_cr_cert_with_ns1.yaml"),
inputArgs: []string{cr3Name},
inputNamespace: ns2,
keyFilename: "",
@ -88,7 +89,7 @@ func TestCtlCreateCRBehaviourBeforeAnythingIsCreated(t *testing.T) {
expErrMsg: "the namespace from the provided object \"testns-1\" does not match the namespace \"testns-2\". You must pass '--namespace=testns-1' to perform this operation.",
},
"file passed in defines resource other than certificate": {
inputFile: testdataPath + "create_cr_issuer.yaml",
inputFile: path.Join(testdataPath, "create_cr_issuer.yaml"),
inputArgs: []string{cr4Name},
inputNamespace: ns1,
keyFilename: "",
@ -130,11 +131,9 @@ func TestCtlCreateCRBehaviourBeforeAnythingIsCreated(t *testing.T) {
} else if err.Error() != test.expErrMsg {
t.Errorf("got unexpected error when trying to create CR, expected: %v; actual: %v", test.expErrMsg, err)
}
} else {
} else if test.expRunErr {
// got no error
if test.expRunErr {
t.Errorf("expected but got no error when creating CR")
}
t.Errorf("expected but got no error when creating CR")
}
})
}
@ -159,7 +158,7 @@ func TestCtlCreateCRBeforeCRIsCreated(t *testing.T) {
tests := map[string]CreateCRTest{
"path to file to store private key provided": {
inputFile: testdataPath + "create_cr_cert_with_ns1.yaml",
inputFile: path.Join(testdataPath, "create_cr_cert_with_ns1.yaml"),
inputArgs: []string{cr5Name},
inputNamespace: ns1,
keyFilename: "test.key",
@ -256,7 +255,7 @@ func TestCtlCreateCRSuccessful(t *testing.T) {
tests := map[string]CreateCRTest{
"v1alpha2 Certificate given": {
inputFile: testdataPath + "create_cr_cert_with_ns1.yaml",
inputFile: path.Join(testdataPath, "create_cr_cert_with_ns1.yaml"),
inputArgs: []string{cr1Name},
inputNamespace: ns1,
keyFilename: "",
@ -266,7 +265,7 @@ func TestCtlCreateCRSuccessful(t *testing.T) {
expKeyFilename: cr1Name + ".key",
},
"v1alpha3 Certificate given": {
inputFile: testdataPath + "create_cr_v1alpha3_cert_with_ns1.yaml",
inputFile: path.Join(testdataPath, "create_cr_v1alpha3_cert_with_ns1.yaml"),
inputArgs: []string{cr2Name},
inputNamespace: ns1,
keyFilename: "",
@ -276,7 +275,7 @@ func TestCtlCreateCRSuccessful(t *testing.T) {
expKeyFilename: cr2Name + ".key",
},
"path to file to store private key provided": {
inputFile: testdataPath + "create_cr_cert_with_ns1.yaml",
inputFile: path.Join(testdataPath, "create_cr_cert_with_ns1.yaml"),
inputArgs: []string{cr5Name},
inputNamespace: ns1,
keyFilename: "test.key",
@ -286,7 +285,7 @@ func TestCtlCreateCRSuccessful(t *testing.T) {
expKeyFilename: "test.key",
},
"fetch flag set and CR will be ready and status.certificate set": {
inputFile: testdataPath + "create_cr_cert_with_ns1.yaml",
inputFile: path.Join(testdataPath, "create_cr_cert_with_ns1.yaml"),
inputArgs: []string{cr6Name},
inputNamespace: ns1,
keyFilename: "",
@ -306,7 +305,7 @@ func TestCtlCreateCRSuccessful(t *testing.T) {
expCertFileContent: exampleCertificate,
},
"fetch flag set and CR will be ready but status.certificate empty": {
inputFile: testdataPath + "create_cr_cert_with_ns1.yaml",
inputFile: path.Join(testdataPath, "create_cr_cert_with_ns1.yaml"),
inputArgs: []string{cr7Name},
inputNamespace: ns1,
keyFilename: "",
@ -444,7 +443,7 @@ func getTestDataDir(t *testing.T) string {
if err != nil {
t.Fatal(err)
}
return testWorkingDirectory + "/testdata/"
return path.Join(testWorkingDirectory, "testdata")
}
// setupPathForTest sets up a tmp directory and cd into it for tests as the command being tested creates files