Skip to content

Commit 74d5784

Browse files
authored
Merge pull request kubernetes#123910 from MarSik/fix-printer-leap-y
Fix printers tests - remove dependency on leap years
2 parents 6809180 + 5ba8f88 commit 74d5784

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

pkg/printers/internalversion/printers_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -970,7 +970,7 @@ func TestPrintIngress(t *testing.T) {
970970
ingress := networking.Ingress{
971971
ObjectMeta: metav1.ObjectMeta{
972972
Name: "test1",
973-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
973+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
974974
},
975975
Spec: networking.IngressSpec{
976976
IngressClassName: utilpointer.StringPtr("foo"),
@@ -1018,7 +1018,7 @@ func TestPrintIngressClass(t *testing.T) {
10181018
ingressClass: &networking.IngressClass{
10191019
ObjectMeta: metav1.ObjectMeta{
10201020
Name: "test1",
1021-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
1021+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
10221022
},
10231023
Spec: networking.IngressClassSpec{
10241024
Controller: "example.com/controller",
@@ -1031,7 +1031,7 @@ func TestPrintIngressClass(t *testing.T) {
10311031
ingressClass: &networking.IngressClass{
10321032
ObjectMeta: metav1.ObjectMeta{
10331033
Name: "test1",
1034-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
1034+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
10351035
},
10361036
Spec: networking.IngressClassSpec{
10371037
Controller: "example.com/controller",
@@ -1048,7 +1048,7 @@ func TestPrintIngressClass(t *testing.T) {
10481048
ingressClass: &networking.IngressClass{
10491049
ObjectMeta: metav1.ObjectMeta{
10501050
Name: "test2",
1051-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-11, 0, 0)},
1051+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-11 * 365 * 24 * time.Hour))},
10521052
},
10531053
Spec: networking.IngressClassSpec{
10541054
Controller: "example.com/controller2",
@@ -2276,7 +2276,7 @@ func TestTranslateTimestampSince(t *testing.T) {
22762276
{"an hour ago", translateTimestampSince(metav1.Time{Time: time.Now().Add(-6e12)}), "100m"},
22772277
{"2 days ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -2)}), "2d"},
22782278
{"months ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -90)}), "90d"},
2279-
{"10 years ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}), "10y"},
2279+
{"10 years ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().Add(time.Duration(-10 * 365 * 24 * time.Hour))}), "10y"},
22802280
}
22812281
for _, test := range tl {
22822282
if test.got != test.exp {
@@ -2301,7 +2301,7 @@ func TestTranslateTimestampUntil(t *testing.T) {
23012301
{"in an hour", translateTimestampUntil(metav1.Time{Time: time.Now().Add(6e12 + buf)}), "100m"},
23022302
{"in 2 days", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, 2).Add(buf)}), "2d"},
23032303
{"in months", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, 90).Add(buf)}), "90d"},
2304-
{"in 10 years", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(10, 0, 0).Add(buf)}), "10y"},
2304+
{"in 10 years", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().Add(time.Duration(10 * 365 * 24 * time.Hour)).Add(buf)}), "10y"},
23052305
}
23062306
for _, test := range tl {
23072307
if test.got != test.exp {
@@ -2619,7 +2619,7 @@ func TestPrintJob(t *testing.T) {
26192619
job: batch.Job{
26202620
ObjectMeta: metav1.ObjectMeta{
26212621
Name: "job3",
2622-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
2622+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
26232623
},
26242624
Spec: batch.JobSpec{
26252625
Completions: nil,
@@ -2638,7 +2638,7 @@ func TestPrintJob(t *testing.T) {
26382638
job: batch.Job{
26392639
ObjectMeta: metav1.ObjectMeta{
26402640
Name: "job4",
2641-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
2641+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
26422642
},
26432643
Spec: batch.JobSpec{
26442644
Completions: nil,
@@ -6678,7 +6678,7 @@ func TestPrintIPAddress(t *testing.T) {
66786678
ip := networking.IPAddress{
66796679
ObjectMeta: metav1.ObjectMeta{
66806680
Name: "192.168.2.2",
6681-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
6681+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
66826682
},
66836683
Spec: networking.IPAddressSpec{
66846684
ParentRef: &networking.ParentReference{

0 commit comments

Comments
 (0)