From 60ded1d54a3678d9c95341f6685e0430ca978dc7 Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Tue, 12 Feb 2019 21:01:39 +0000 Subject: [PATCH] Fix golint failures of test/e2e/framework/timer --- hack/.golint_failures | 1 - test/e2e/framework/timer/timer.go | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hack/.golint_failures b/hack/.golint_failures index 947288e74a2..1e4faebedda 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -689,7 +689,6 @@ test/e2e/framework/providers/aws test/e2e/framework/providers/azure test/e2e/framework/providers/gce test/e2e/framework/providers/kubemark -test/e2e/framework/timer test/e2e/instrumentation test/e2e/instrumentation/logging test/e2e/instrumentation/monitoring diff --git a/test/e2e/framework/timer/timer.go b/test/e2e/framework/timer/timer.go index 37769cb3449..9620ae021c5 100644 --- a/test/e2e/framework/timer/timer.go +++ b/test/e2e/framework/timer/timer.go @@ -29,7 +29,7 @@ import ( var now = time.Now -// Represents a phase of a test. Phases can overlap. +// Phase represents a phase of a test. Phases can overlap. type Phase struct { sequenceNumber int name string @@ -63,9 +63,8 @@ func (phase *Phase) duration() time.Duration { func (phase *Phase) humanReadable() string { if phase.ended() { return fmt.Sprintf("Phase %s: %v\n", phase.label(), phase.duration()) - } else { - return fmt.Sprintf("Phase %s: %v so far\n", phase.label(), phase.duration()) } + return fmt.Sprintf("Phase %s: %v so far\n", phase.label(), phase.duration()) } // A TestPhaseTimer groups phases and provides a way to export their measurements as JSON or human-readable text. @@ -93,10 +92,12 @@ func (timer *TestPhaseTimer) StartPhase(sequenceNumber int, phaseName string) *P return newPhase } +// SummaryKind returns the summary of test summary. func (timer *TestPhaseTimer) SummaryKind() string { return "TestPhaseTimer" } +// PrintHumanReadable returns durations of all phases. func (timer *TestPhaseTimer) PrintHumanReadable() string { buf := bytes.Buffer{} timer.lock.Lock() @@ -107,6 +108,7 @@ func (timer *TestPhaseTimer) PrintHumanReadable() string { return buf.String() } +// PrintJSON returns durations of all phases with JSON format. func (timer *TestPhaseTimer) PrintJSON() string { data := perftype.PerfData{ Version: "v1",