mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-06 16:06:56 +00:00
Code Activity

fix unit tests

Browse source
This commit is contained in:
Shuting Zhao 2020-10-26 23:07:16 -07:00
parent 260e4af722
commit 0c46b5700b
3 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkg/kyverno/apply/generate.go
View file

@ -134,25 +134,25 @@ func updateSummary(results []interface{}) map[string]interface{} {
continue
}
pass, _ := summary["pass"].(int64)
pass, _ := summary["Pass"].(int64)
pass += int64(len(resources))
summary["pass"] = pass
summary["Pass"] = pass
case report.StatusFail:
fail, _ := summary["fail"].(int64)
fail, _ := summary["Fail"].(int64)
fail++
summary["fail"] = fail
case "warn":
warn, _ := summary["warn"].(int64)
summary["Fail"] = fail
case "Warn":
warn, _ := summary["Warn"].(int64)
warn++
summary["warn"] = warn
case "error":
e, _ := summary["error"].(int64)
case "Error":
e, _ := summary["Error"].(int64)
e++
summary["error"] = e
case "skip":
skip, _ := summary["skip"].(int64)
summary["Error"] = e
case "Skip":
skip, _ := summary["Skip"].(int64)
skip++
summary["skip"] = skip
summary["Skip"] = skip
}
}

34
pkg/kyverno/apply/generate_test.go
View file

@ -21,7 +21,7 @@ func Test_mergeClusterReport(t *testing.T) {
"results": []interface{}{
map[string]interface{}{
"policy": "ns-polr-1",
"status": "pass",
"status": "Pass",
"resources": make([]interface{}, 10),
},
},
@ -37,7 +37,7 @@ func Test_mergeClusterReport(t *testing.T) {
"results": []interface{}{
map[string]interface{}{
"policy": "ns-polr-2",
"status": "pass",
"status": "Pass",
"resources": make([]interface{}, 5),
},
},
@ -51,7 +51,7 @@ func Test_mergeClusterReport(t *testing.T) {
"results": []interface{}{
map[string]interface{}{
"policy": "polr-3",
"status": "pass",
"status": "Pass",
"resources": make([]interface{}, 1),
},
},
@ -67,7 +67,7 @@ func Test_mergeClusterReport(t *testing.T) {
"results": []interface{}{
map[string]interface{}{
"policy": "cpolr-4",
"status": "fail",
"status": "Fail",
},
},
},
@ -82,7 +82,7 @@ func Test_mergeClusterReport(t *testing.T) {
"results": []interface{}{
map[string]interface{}{
"policy": "cpolr-5",
"status": "fail",
"status": "Fail",
},
},
},
@ -92,21 +92,21 @@ func Test_mergeClusterReport(t *testing.T) {
expectedResults := []interface{}{
map[string]interface{}{
"policy": "ns-polr-2",
"status": "pass",
"status": "Pass",
"resources": make([]interface{}, 5),
},
map[string]interface{}{
"policy": "polr-3",
"status": "pass",
"status": "Pass",
"resources": make([]interface{}, 1),
},
map[string]interface{}{
"policy": "cpolr-4",
"status": "fail",
"status": "Fail",
},
map[string]interface{}{
"policy": "cpolr-5",
"status": "fail",
"status": "Fail",
},
}
@ -123,28 +123,28 @@ func Test_mergeClusterReport(t *testing.T) {
summary, _, err := unstructured.NestedMap(cpolr.UnstructuredContent(), "summary")
assert.NilError(t, err)
assert.Assert(t, summary["pass"].(int64) == 6, summary["pass"])
assert.Assert(t, summary["fail"].(int64) == 2, summary["fail"])
assert.Assert(t, summary["Pass"].(int64) == 6, summary["Pass"])
assert.Assert(t, summary["Fail"].(int64) == 2, summary["Fail"])
}
func Test_updateSummary(t *testing.T) {
results := []interface{}{
map[string]interface{}{
"status": "pass",
"status": "Pass",
"resources": make([]interface{}, 5),
},
map[string]interface{}{
"status": "fail",
"status": "Fail",
},
map[string]interface{}{
"status": "fail",
"status": "Fail",
},
map[string]interface{}{
"status": "fail",
"status": "Fail",
},
}
summary := updateSummary(results)
assert.Assert(t, summary["pass"].(int64) == 5, summary["pass"])
assert.Assert(t, summary["fail"].(int64) == 3, summary["fail"])
assert.Assert(t, summary["Pass"].(int64) == 5, summary["Pass"])
assert.Assert(t, summary["Fail"].(int64) == 3, summary["Fail"])
}

50
pkg/kyverno/apply/report_test.go
View file

@ -75,15 +75,15 @@ func Test_buildPolicyReports(t *testing.T) {
assert.Assert(t, report.GetKind() == "ClusterPolicyReport")
assert.Assert(t, len(report.UnstructuredContent()["results"].([]interface{})) == 2)
assert.Assert(t,
report.UnstructuredContent()["summary"].(map[string]interface{})["pass"].(int64) == 1,
report.UnstructuredContent()["summary"].(map[string]interface{})["pass"].(int64))
report.UnstructuredContent()["summary"].(map[string]interface{})["Pass"].(int64) == 1,
report.UnstructuredContent()["summary"].(map[string]interface{})["Pass"].(int64))
} else {
assert.Assert(t, report.GetName() == "policyreport-ns-policy1-namespace")
assert.Assert(t, report.GetKind() == "PolicyReport")
assert.Assert(t, len(report.UnstructuredContent()["results"].([]interface{})) == 2)
assert.Assert(t,
report.UnstructuredContent()["summary"].(map[string]interface{})["pass"].(int64) == 1,
report.UnstructuredContent()["summary"].(map[string]interface{})["pass"].(int64))
report.UnstructuredContent()["summary"].(map[string]interface{})["Pass"].(int64) == 1,
report.UnstructuredContent()["summary"].(map[string]interface{})["Pass"].(int64))
}
}
}
@ -100,9 +100,9 @@ func Test_buildPolicyResults(t *testing.T) {
for _, r := range result {
switch r.Rule {
case "policy1-rule1", "clusterpolicy2-rule1":
assert.Assert(t, r.Status == report.PolicyStatus("pass"))
assert.Assert(t, r.Status == report.PolicyStatus("Pass"))
case "policy1-rule2", "clusterpolicy2-rule2":
assert.Assert(t, r.Status == report.PolicyStatus("fail"))
assert.Assert(t, r.Status == report.PolicyStatus("Fail"))
}
}
}
@ -112,7 +112,7 @@ func Test_mergeSucceededResults(t *testing.T) {
resultsMap := map[string][]*report.PolicyReportResult{
clusterpolicyreport: {
{
Status: report.PolicyStatus("pass"),
Status: report.PolicyStatus("Pass"),
Policy: "clusterpolicy",
Rule: "clusterrule",
Resources: []*v1.ObjectReference{
@ -125,7 +125,7 @@ func Test_mergeSucceededResults(t *testing.T) {
},
},
{
Status: report.PolicyStatus("pass"),
Status: report.PolicyStatus("Pass"),
Policy: "clusterpolicy",
Rule: "clusterrule",
Resources: []*v1.ObjectReference{
@ -138,7 +138,7 @@ func Test_mergeSucceededResults(t *testing.T) {
},
},
{
Status: report.PolicyStatus("fail"),
Status: report.PolicyStatus("Fail"),
Policy: "clusterpolicy",
Rule: "clusterrule",
Resources: []*v1.ObjectReference{
@ -151,7 +151,7 @@ func Test_mergeSucceededResults(t *testing.T) {
"policyreport-ns-test1": {
{
Status: report.PolicyStatus("pass"),
Status: report.PolicyStatus("Pass"),
Policy: "test1-policy",
Rule: "test1-rule",
Resources: []*v1.ObjectReference{
@ -164,7 +164,7 @@ func Test_mergeSucceededResults(t *testing.T) {
},
},
{
Status: report.PolicyStatus("pass"),
Status: report.PolicyStatus("Pass"),
Policy: "test1-policy",
Rule: "test1-rule",
Resources: []*v1.ObjectReference{
@ -177,7 +177,7 @@ func Test_mergeSucceededResults(t *testing.T) {
},
},
{
Status: report.PolicyStatus("fail"),
Status: report.PolicyStatus("Fail"),
Policy: "test1-policy",
Rule: "test1-rule",
Resources: []*v1.ObjectReference{
@ -189,7 +189,7 @@ func Test_mergeSucceededResults(t *testing.T) {
},
"policyreport-ns-test2": {
{
Status: report.PolicyStatus("pass"),
Status: report.PolicyStatus("Pass"),
Policy: "test2-policy",
Rule: "test2-rule",
Resources: []*v1.ObjectReference{
@ -208,10 +208,10 @@ func Test_mergeSucceededResults(t *testing.T) {
assert.Assert(t, len(results) == len(resultsMap), len(results), len(resultsMap))
for key, result := range results {
if key == clusterpolicyreport {
assert.Assert(t, len(result) == 2)
assert.Assert(t, len(result) == 3, len(result))
for _, res := range result {
if res.Status == report.PolicyStatus("pass") {
assert.Assert(t, len(res.Resources) == 4, len(res.Resources))
if res.Status == report.PolicyStatus("Pass") {
assert.Assert(t, len(res.Resources) == 2, len(res.Resources))
} else {
assert.Assert(t, len(res.Resources) == 1, len(res.Resources))
}
@ -219,10 +219,10 @@ func Test_mergeSucceededResults(t *testing.T) {
}
if key == "policyreport-ns-test1" {
assert.Assert(t, len(result) == 2, len(result))
assert.Assert(t, len(result) == 3, len(result))
for _, res := range result {
if res.Status == report.PolicyStatus("pass") {
assert.Assert(t, len(res.Resources) == 4, len(res.Resources))
if res.Status == report.PolicyStatus("Pass") {
assert.Assert(t, len(res.Resources) == 2, len(res.Resources))
} else {
assert.Assert(t, len(res.Resources) == 1, len(res.Resources))
}
@ -239,17 +239,17 @@ func Test_calculateSummary(t *testing.T) {
results := []*report.PolicyReportResult{
{
Resources: make([]*v1.ObjectReference, 5),
Status: report.PolicyStatus("pass"),
Status: report.PolicyStatus("Pass"),
},
{Status: report.PolicyStatus("fail")},
{Status: report.PolicyStatus("fail")},
{Status: report.PolicyStatus("fail")},
{Status: report.PolicyStatus("Fail")},
{Status: report.PolicyStatus("Fail")},
{Status: report.PolicyStatus("Fail")},
{
Resources: make([]*v1.ObjectReference, 1),
Status: report.PolicyStatus("pass")},
Status: report.PolicyStatus("Pass")},
{
Resources: make([]*v1.ObjectReference, 4),
Status: report.PolicyStatus("pass"),
Status: report.PolicyStatus("Pass"),
},
}