Skip to content

Commit 5bcaa93

Browse files
authored
chore(enterprise/coderd/license): fix time-related flake in license expiration warning test (coder#15228)
Fixes a time-related test flake in enterprise/coderd/license/license_test.go
1 parent b62f3e6 commit 5bcaa93

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

enterprise/coderd/license/license_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestEntitlements(t *testing.T) {
5454
db := dbmem.New()
5555
db.InsertLicense(context.Background(), database.InsertLicenseParams{
5656
JWT: coderdenttest.GenerateLicense(t, coderdenttest.LicenseOptions{}),
57-
Exp: time.Now().Add(time.Hour),
57+
Exp: dbtime.Now().Add(time.Hour),
5858
})
5959
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, empty)
6060
require.NoError(t, err)
@@ -78,7 +78,7 @@ func TestEntitlements(t *testing.T) {
7878
return f
7979
}(),
8080
}),
81-
Exp: time.Now().Add(time.Hour),
81+
Exp: dbtime.Now().Add(time.Hour),
8282
})
8383
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, empty)
8484
require.NoError(t, err)
@@ -98,10 +98,10 @@ func TestEntitlements(t *testing.T) {
9898
codersdk.FeatureAuditLog: 1,
9999
},
100100

101-
GraceAt: time.Now().Add(-time.Hour),
102-
ExpiresAt: time.Now().Add(time.Hour),
101+
GraceAt: dbtime.Now().Add(-time.Hour),
102+
ExpiresAt: dbtime.Now().Add(time.Hour),
103103
}),
104-
Exp: time.Now().Add(time.Hour),
104+
Exp: dbtime.Now().Add(time.Hour),
105105
})
106106
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
107107
require.NoError(t, err)
@@ -124,10 +124,10 @@ func TestEntitlements(t *testing.T) {
124124
codersdk.FeatureAuditLog: 1,
125125
},
126126

127-
GraceAt: time.Now().AddDate(0, 0, 2),
128-
ExpiresAt: time.Now().AddDate(0, 0, 5),
127+
GraceAt: dbtime.Now().AddDate(0, 0, 2),
128+
ExpiresAt: dbtime.Now().AddDate(0, 0, 5),
129129
}),
130-
Exp: time.Now().AddDate(0, 0, 5),
130+
Exp: dbtime.Now().AddDate(0, 0, 5),
131131
})
132132

133133
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
@@ -153,8 +153,8 @@ func TestEntitlements(t *testing.T) {
153153
codersdk.FeatureAuditLog: 1,
154154
},
155155

156-
GraceAt: time.Now().AddDate(0, 0, 1),
157-
ExpiresAt: time.Now().AddDate(0, 0, 5),
156+
GraceAt: dbtime.Now().AddDate(0, 0, 1),
157+
ExpiresAt: dbtime.Now().AddDate(0, 0, 5),
158158
}),
159159
Exp: time.Now().AddDate(0, 0, 5),
160160
})
@@ -183,10 +183,10 @@ func TestEntitlements(t *testing.T) {
183183
},
184184

185185
Trial: true,
186-
GraceAt: time.Now().AddDate(0, 0, 8),
187-
ExpiresAt: time.Now().AddDate(0, 0, 5),
186+
GraceAt: dbtime.Now().AddDate(0, 0, 8),
187+
ExpiresAt: dbtime.Now().AddDate(0, 0, 5),
188188
}),
189-
Exp: time.Now().AddDate(0, 0, 5),
189+
Exp: dbtime.Now().AddDate(0, 0, 5),
190190
})
191191

192192
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)
@@ -212,10 +212,10 @@ func TestEntitlements(t *testing.T) {
212212
codersdk.FeatureAuditLog: 1,
213213
},
214214

215-
GraceAt: time.Now().AddDate(0, 0, 30),
216-
ExpiresAt: time.Now().AddDate(0, 0, 5),
215+
GraceAt: dbtime.Now().AddDate(0, 0, 30),
216+
ExpiresAt: dbtime.Now().AddDate(0, 0, 5),
217217
}),
218-
Exp: time.Now().AddDate(0, 0, 5),
218+
Exp: dbtime.Now().AddDate(0, 0, 5),
219219
})
220220

221221
entitlements, err := license.Entitlements(context.Background(), db, 1, 1, coderdenttest.Keys, all)

0 commit comments

Comments
 (0)