github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73978 from oomichi/golint-e2e-framework-timer 

Fix golint failures of test/e2e/framework/timer
pull/564/head
Kubernetes Prow Robot 2019-02-12 17:29:43 -08:00 committed by GitHub
parent 6949a81ce6 60ded1d54a
commit 5c780c8cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@ -687,7 +687,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

8
test/e2e/framework/timer/timer.go
View File

@ -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",