chore: make SCIM work with single-region CRDB

gaultier · ory-bot · commit f9de4cc45f7e · 2025-11-17T15:22:51.000Z
GitOrigin-RevId: 75ad7a5b7e4585b55145404ba1e487522b028886
diff --git a/courier/test/persistence.go b/courier/test/persistence.go
@@ -47,12 +47,12 @@ func TestPersister(ctx context.Context, newNetworkUnlessExisting NetworkWrapper,
 
 		messages := make([]courier.Message, 5)
 		t.Run("case=add messages to the queue", func(t *testing.T) {
-			t.Cleanup(func() { pop.SetNowFunc(time.Now) })
+			t.Cleanup(func() { pop.SetNowFunc(func() time.Time { return time.Now().Round(time.Second) }) })
 			now := time.Now()
 			for k := range messages {
 				// We need to fake the time func to control the created_at column, which is the
 				// sort key for the messages.
-				pop.SetNowFunc(func() time.Time { return now.Add(time.Duration(k) * time.Hour) })
+				pop.SetNowFunc(func() time.Time { return now.Add(time.Duration(k) * time.Hour).Round(time.Second) })
 				require.NoError(t, faker.FakeData(&messages[k]))
 				require.NoError(t, p.AddMessage(ctx, &messages[k]))
 			}
diff --git a/session/test/persistence.go b/session/test/persistence.go
@@ -169,7 +169,7 @@ func TestPersister(ctx context.Context, conf *config.Config, p interface {
 					device,
 				}
 				pop.SetNowFunc(func() time.Time {
-					return start.Add(time.Duration(j) * time.Minute)
+					return start.Add(time.Duration(j) * time.Minute).Round(time.Second)
 				})
 				require.NoError(t, l.UpsertSession(ctx, &seedSessionsList[j]))
 				seedSessionIDs[j] = seedSessionsList[j].ID
diff --git a/session/tokenizer_test.go b/session/tokenizer_test.go
@@ -80,7 +80,7 @@ func TestTokenizer(t *testing.T) {
 	tkn := session.NewTokenizer(reg)
 	nowDate := time.Date(2023, 02, 01, 00, 00, 00, 0, time.UTC)
 	tkn.SetNowFunc(func() time.Time {
-		return nowDate
+		return nowDate.Round(time.Second)
 	})
 
 	r := httptest.NewRequest("GET", "/sessions/whoami", nil)

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ func TestPersister(ctx context.Context, conf *config.Config, p interface {`
`169`	`169`	`device,`
`170`	`170`	`}`
`171`	`171`	`pop.SetNowFunc(func() time.Time {`
`172`		`- return start.Add(time.Duration(j) * time.Minute)`
	`172`	`+ return start.Add(time.Duration(j) * time.Minute).Round(time.Second)`
`173`	`173`	`})`
`174`	`174`	`require.NoError(t, l.UpsertSession(ctx, &seedSessionsList[j]))`
`175`	`175`	`seedSessionIDs[j] = seedSessionsList[j].ID`