From d5f1dfb6536f5683aabc05e4c8057252391aff7c Mon Sep 17 00:00:00 2001 From: RincewindsHat Date: Sat, 17 Jun 2023 12:11:55 +0200 Subject: [PATCH] Add spaces to perfdata for partialResults and test it --- result/overall.go | 4 ++-- result/overall_test.go | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/result/overall.go b/result/overall.go index b740a21..12f71a2 100644 --- a/result/overall.go +++ b/result/overall.go @@ -268,11 +268,11 @@ func (s *PartialResult) getPerfdata() string { if s.PartialResults != nil { for _, ss := range s.PartialResults { - output.WriteString(ss.getPerfdata()) + output.WriteString(" " + ss.getPerfdata()) } } - return output.String() + return strings.TrimSpace(output.String()) } // Generates indented output for all subsequent PartialResults diff --git a/result/overall_test.go b/result/overall_test.go index 021e9e1..1e1cb84 100644 --- a/result/overall_test.go +++ b/result/overall_test.go @@ -297,7 +297,13 @@ func TestOverall_withSubchecks_PartialResult(t *testing.T) { Value: 300, Uom: "%", } + perf3 := perfdata.Perfdata{ + Label: "baz", + Value: 23, + Uom: "B", + } + subcheck3.Perfdata.Add(&perf3) subcheck2.Perfdata.Add(&perf1) subcheck2.Perfdata.Add(&perf2) subcheck2.PartialResults = append(subcheck.PartialResults, subcheck3) @@ -309,7 +315,7 @@ func TestOverall_withSubchecks_PartialResult(t *testing.T) { \_ [OK] PartialResult \_ [OK] SubSubcheck \_ [CRITICAL] SubSubSubcheck -|foo=3 bar=300% +|foo=3 bar=300% baz=23B ` assert.Equal(t, res, overall.GetOutput())