github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix exact year inconsistencies in human readable duration

Browse Source
This commit is contained in:
bitscuit
2020-04-10 20:06:57 -07:00
parent ee6b88ddf9
commit 5fa7a08e1c
2 changed files with 13 additions and 4 deletions
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 { } else if hours < 24*365*2 {
return fmt.Sprintf("%dd", hours/24) return fmt.Sprintf("%dd", hours/24)
} else if hours < 24*365*8 { } 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)) return fmt.Sprintf("%dy", int(hours/24/365))
} }

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

@@ -74,9 +74,14 @@ func TestHumanDurationBoundaries(t *testing.T) {
{d: 8 * 24 * time.Hour, want: "8d"}, {d: 8 * 24 * time.Hour, want: "8d"},
{d: 8*24*time.Hour + 23*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 - time.Millisecond, want: "729d"},
{d: 2 * 365 * 24 * time.Hour, want: "2y0d"}, {d: 2 * 365 * 24 * time.Hour, want: "2y"},
{d: 2*365*24*time.Hour + 23*time.Hour, want: "2y0d"}, {d: 2*365*24*time.Hour + 23*time.Hour, want: "2y"},
{d: 3 * 365 * 24 * time.Hour, want: "3y0d"}, {d: 2*365*24*time.Hour + 23*time.Hour + 59*time.Minute, want: "2y"},
{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 - time.Millisecond, want: "7y364d"},
{d: 8 * 365 * 24 * time.Hour, want: "8y"}, {d: 8 * 365 * 24 * time.Hour, want: "8y"},
{d: 8*365*24*time.Hour + 364*24*time.Hour, want: "8y"}, {d: 8*365*24*time.Hour + 364*24*time.Hour, want: "8y"},