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

Merge pull request #123910 from MarSik/fix-printer-leap-y

Browse Source 
Fix printers tests - remove dependency on leap years
This commit is contained in:
Kubernetes Prow Robot
2024-05-22 07:51:29 -07:00
committed by GitHub
parent 68091805a5 5ba8f886bf
commit 74d578485d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/printers/internalversion/printers_test.go
View File

@@ -970,7 +970,7 @@ func TestPrintIngress(t *testing.T) {
ingress := networking.Ingress{ ingress := networking.Ingress{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "test1", Name: "test1",
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
}, },
Spec: networking.IngressSpec{ Spec: networking.IngressSpec{
IngressClassName: utilpointer.StringPtr("foo"), IngressClassName: utilpointer.StringPtr("foo"),
@@ -1018,7 +1018,7 @@ func TestPrintIngressClass(t *testing.T) {
ingressClass: &networking.IngressClass{ ingressClass: &networking.IngressClass{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "test1", Name: "test1",
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
}, },
Spec: networking.IngressClassSpec{ Spec: networking.IngressClassSpec{
Controller: "example.com/controller", Controller: "example.com/controller",
@@ -1031,7 +1031,7 @@ func TestPrintIngressClass(t *testing.T) {
ingressClass: &networking.IngressClass{ ingressClass: &networking.IngressClass{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "test1", Name: "test1",
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
}, },
Spec: networking.IngressClassSpec{ Spec: networking.IngressClassSpec{
Controller: "example.com/controller", Controller: "example.com/controller",
@@ -1048,7 +1048,7 @@ func TestPrintIngressClass(t *testing.T) {
ingressClass: &networking.IngressClass{ ingressClass: &networking.IngressClass{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "test2", Name: "test2",
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-11, 0, 0)}, CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-11 * 365 * 24 * time.Hour))},
}, },
Spec: networking.IngressClassSpec{ Spec: networking.IngressClassSpec{
Controller: "example.com/controller2", Controller: "example.com/controller2",
@@ -2276,7 +2276,7 @@ func TestTranslateTimestampSince(t *testing.T) {
{"an hour ago", translateTimestampSince(metav1.Time{Time: time.Now().Add(-6e12)}), "100m"}, {"an hour ago", translateTimestampSince(metav1.Time{Time: time.Now().Add(-6e12)}), "100m"},
{"2 days ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -2)}), "2d"}, {"2 days ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -2)}), "2d"},
{"months ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -90)}), "90d"}, {"months ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, -90)}), "90d"},
{"10 years ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().AddDate(-10, 0, 0)}), "10y"}, {"10 years ago", translateTimestampSince(metav1.Time{Time: time.Now().UTC().Add(time.Duration(-10 * 365 * 24 * time.Hour))}), "10y"},
} }
for _, test := range tl { for _, test := range tl {
if test.got != test.exp { if test.got != test.exp {
@@ -2301,7 +2301,7 @@ func TestTranslateTimestampUntil(t *testing.T) {
{"in an hour", translateTimestampUntil(metav1.Time{Time: time.Now().Add(6e12 + buf)}), "100m"}, {"in an hour", translateTimestampUntil(metav1.Time{Time: time.Now().Add(6e12 + buf)}), "100m"},
{"in 2 days", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, 2).Add(buf)}), "2d"}, {"in 2 days", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, 2).Add(buf)}), "2d"},
{"in months", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, 90).Add(buf)}), "90d"}, {"in months", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(0, 0, 90).Add(buf)}), "90d"},
{"in 10 years", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().AddDate(10, 0, 0).Add(buf)}), "10y"}, {"in 10 years", translateTimestampUntil(metav1.Time{Time: time.Now().UTC().Add(time.Duration(10 * 365 * 24 * time.Hour)).Add(buf)}), "10y"},
} }
for _, test := range tl { for _, test := range tl {
if test.got != test.exp { if test.got != test.exp {
@@ -2619,7 +2619,7 @@ func TestPrintJob(t *testing.T) {
job: batch.Job{ job: batch.Job{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "job3", Name: "job3",
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
}, },
Spec: batch.JobSpec{ Spec: batch.JobSpec{
Completions: nil, Completions: nil,
@@ -2638,7 +2638,7 @@ func TestPrintJob(t *testing.T) {
job: batch.Job{ job: batch.Job{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "job4", Name: "job4",
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
}, },
Spec: batch.JobSpec{ Spec: batch.JobSpec{
Completions: nil, Completions: nil,
@@ -6678,7 +6678,7 @@ func TestPrintIPAddress(t *testing.T) {
ip := networking.IPAddress{ ip := networking.IPAddress{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "192.168.2.2", Name: "192.168.2.2",
CreationTimestamp: metav1.Time{Time: time.Now().AddDate(-10, 0, 0)}, CreationTimestamp: metav1.Time{Time: time.Now().Add(time.Duration(-10 * 365 * 24 * time.Hour))},
}, },
Spec: networking.IPAddressSpec{ Spec: networking.IPAddressSpec{
ParentRef: &networking.ParentReference{ ParentRef: &networking.ParentReference{