Skip to content

Fix get summary for overall #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RincewindsHat merged 3 commits into from
Jun 20, 2023
Merged

Fix get summary for overall #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6c2545
Use GetStatus function to retrieve status from partials in creation o…
Jun 20, 2023
76433fe
Remove leftovers in tests
Jun 20, 2023
18c2747
Add tests for changes
Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion result/overall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ func (o *Overall) GetSummary() string {
)

for _, sc := range o.PartialResults {
switch sc.state {
switch sc.GetStatus() {
case check.Critical:
criticals++
case check.Warning:
Expand Down
35 changes: 29 additions & 6 deletions result/overall_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,22 +338,19 @@ func TestOverall_withSubchecks_PartialResultStatus(t *testing.T) {
var overall Overall

subcheck := PartialResult{
stateSetExplicitely: true,
Output: "Subcheck",
Output: "Subcheck",
}

subcheck.SetState(check.OK)

subsubcheck := PartialResult{
stateSetExplicitely: true,
Output: "SubSubcheck",
Output: "SubSubcheck",
}

subsubcheck.SetState(check.Warning)

subsubsubcheck := PartialResult{
stateSetExplicitely: true,
Output: "SubSubSubcheck",
Output: "SubSubSubcheck",
}

subsubsubcheck.SetState(check.Critical)
Expand Down Expand Up @@ -445,3 +442,29 @@ func TestDefaultStates3(t *testing.T) {

assert.Equal(t, check.Warning, overall.GetStatus())
}

func TestOverallOutputWithMultiLayerPartials(t *testing.T) {
var overall Overall

subcheck1 := PartialResult{}
subcheck1.SetState(check.Warning)

subcheck2 := PartialResult{}

subcheck2_1 := PartialResult{}
subcheck2_1.SetState(check.OK)

subcheck2_2 := PartialResult{}
subcheck2_2.SetState(check.Critical)

subcheck2.AddSubcheck(subcheck2_1)
subcheck2.AddSubcheck(subcheck2_2)

overall.AddSubcheck(subcheck1)
overall.AddSubcheck(subcheck2)

resultString := "states: critical=1 warning=1\n\\_ [WARNING] \n\\_ [CRITICAL] \n \\_ [OK] \n \\_ [CRITICAL] \n"

assert.Equal(t, resultString, overall.GetOutput())
assert.Equal(t, check.Critical, overall.GetStatus())
}