Skip to content

Commit 5ba8f88

Browse files
committed
Fix printers tests - remove dependency on leap years
Test that were using AddDate(+y, 0, 0) and then time.Sub were sensitive to a specific date of their execution. An example is a test with AddDate(-5, 0, 0) when executed on 28th of February 2024 and when executed on 1st of March 2024. The difference seen by Sub will be 5y1d in the first case and 5y2d in the second case, because 29th of Feb 2024 is a leap year as well as 29th of Feb 2020 that falls within the 5 year difference. Signed-off-by: Martin Sivak <[email protected]>
1 parent c938455 commit 5ba8f88

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
@@ -968,7 +968,7 @@ func TestPrintIngress(t *testing.T) {
968968
ingress := networking.Ingress{
969969
ObjectMeta: metav1.ObjectMeta{
970970
Name: "test1",
971-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
971+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
972972
},
973973
Spec: networking.IngressSpec{
974974
IngressClassName: utilpointer.StringPtr("foo"),
@@ -1016,7 +1016,7 @@ func TestPrintIngressClass(t *testing.T) {
10161016
ingressClass: &networking.IngressClass{
10171017
ObjectMeta: metav1.ObjectMeta{
10181018
Name: "test1",
1019-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
1019+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
10201020
},
10211021
Spec: networking.IngressClassSpec{
10221022
Controller: "example.com/controller",
@@ -1029,7 +1029,7 @@ func TestPrintIngressClass(t *testing.T) {
10291029
ingressClass: &networking.IngressClass{
10301030
ObjectMeta: metav1.ObjectMeta{
10311031
Name: "test1",
1032-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
1032+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
10331033
},
10341034
Spec: networking.IngressClassSpec{
10351035
Controller: "example.com/controller",
@@ -1046,7 +1046,7 @@ func TestPrintIngressClass(t *testing.T) {
10461046
ingressClass: &networking.IngressClass{
10471047
ObjectMeta: metav1.ObjectMeta{
10481048
Name: "test2",
1049-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-11, 0, 0)},
1049+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-11 * 365 * 24 * time.Hour))},
10501050
},
10511051
Spec: networking.IngressClassSpec{
10521052
Controller: "example.com/controller2",
@@ -2248,7 +2248,7 @@ func TestTranslateTimestampSince(t *testing.T) {
22482248
{"an hour ago", translateTimestampSince(metav1.Time{Time: time.Now().Add(-6e12)}), "100m"},
22492249
{"2 days ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -2)}), "2d"},
22502250
{"months ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -90)}), "90d"},
2251-
{"10 years ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}), "10y"},
2251+
{"10 years ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().Add(time.Duration(-10 * 365 * 24 * time.Hour))}), "10y"},
22522252
}
22532253
for _, test := range tl {
22542254
if test.got != test.exp {
@@ -2273,7 +2273,7 @@ func TestTranslateTimestampUntil(t *testing.T) {
22732273
{"in an hour", translateTimestampUntil(metav1.Time{Time: time.Now().Add(6e12 + buf)}), "100m"},
22742274
{"in 2 days", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, 2).Add(buf)}), "2d"},
22752275
{"in months", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, 90).Add(buf)}), "90d"},
2276-
{"in 10 years", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(10, 0, 0).Add(buf)}), "10y"},
2276+
{"in 10 years", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().Add(time.Duration(10 * 365 * 24 * time.Hour)).Add(buf)}), "10y"},
22772277
}
22782278
for _, test := range tl {
22792279
if test.got != test.exp {
@@ -2591,7 +2591,7 @@ func TestPrintJob(t *testing.T) {
25912591
job: batch.Job{
25922592
ObjectMeta: metav1.ObjectMeta{
25932593
Name: "job3",
2594-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
2594+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
25952595
},
25962596
Spec: batch.JobSpec{
25972597
Completions: nil,
@@ -2610,7 +2610,7 @@ func TestPrintJob(t *testing.T) {
26102610
job: batch.Job{
26112611
ObjectMeta: metav1.ObjectMeta{
26122612
Name: "job4",
2613-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
2613+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
26142614
},
26152615
Spec: batch.JobSpec{
26162616
Completions: nil,
@@ -6650,7 +6650,7 @@ func TestPrintIPAddress(t *testing.T) {
66506650
ip := networking.IPAddress{
66516651
ObjectMeta: metav1.ObjectMeta{
66526652
Name: "192.168.2.2",
6653-
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)},
6653+
CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
66546654
},
66556655
Spec: networking.IPAddressSpec{
66566656
ParentRef: &networking.ParentReference{

0 commit comments

Comments
 (0)