github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90082 from bitscuit/consistent-year-formats

Browse Source 
fix exact year inconsistencies in human readable duration
This commit is contained in:
Kubernetes Prow Robot 2020-04-17 17:23:36 -07:00 committed by GitHub
commit f6f92aa00a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apimachinery/pkg/util/duration/duration.go
View File

@ -83,7 +83,11 @@ func HumanDuration(d time.Duration) string {
} else if hours < 24*365*2 {
return fmt.Sprintf("%dd", hours/24)
} else if hours < 24*365*8 {
return fmt.Sprintf("%dy%dd", hours/24/365, (hours/24)%365)
dy := int(hours/24) % 365
if dy == 0 {
return fmt.Sprintf("%dy", hours/24/365)
}
return fmt.Sprintf("%dy%dd", hours/24/365, dy)
}
return fmt.Sprintf("%dy", int(hours/24/365))
}

13
staging/src/k8s.io/apimachinery/pkg/util/duration/duration_test.go
View File

@ -74,9 +74,16 @@ func TestHumanDurationBoundaries(t *testing.T) {
{d: 8 * 24 * time.Hour, want: "8d"},
{d: 8*24*time.Hour + 23*time.Hour, want: "8d"},
{d: 2*365*24*time.Hour - time.Millisecond, want: "729d"},
{d: 2 * 365 * 24 * time.Hour, want: "2y0d"},
{d: 2*365*24*time.Hour + 23*time.Hour, want: "2y0d"},
{d: 3 * 365 * 24 * time.Hour, want: "3y0d"},
{d: 2 * 365 * 24 * time.Hour, want: "2y"},
{d: 2*365*24*time.Hour + 23*time.Hour, want: "2y"},
{d: 2*365*24*time.Hour + 23*time.Hour + 59*time.Minute, want: "2y"},
{d: 2*365*24*time.Hour + 24*time.Hour - time.Millisecond, want: "2y"},
{d: 2*365*24*time.Hour + 24*time.Hour, want: "2y1d"},
{d: 3 * 365 * 24 * time.Hour, want: "3y"},
{d: 4 * 365 * 24 * time.Hour, want: "4y"},
{d: 5 * 365 * 24 * time.Hour, want: "5y"},
{d: 6 * 365 * 24 * time.Hour, want: "6y"},
{d: 7 * 365 * 24 * time.Hour, want: "7y"},
{d: 8*365*24*time.Hour - time.Millisecond, want: "7y364d"},
{d: 8 * 365 * 24 * time.Hour, want: "8y"},
{d: 8*365*24*time.Hour + 364*24*time.Hour, want: "8y"},