Test faster polling.

Squidex · Jan 14, 2025 · f17761c · f17761c
1 parent 701104f
commit f17761c
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 10 deletions.
diff --git a/events/Squidex.Events.Tests/EventStoreTests.cs b/events/Squidex.Events.Tests/EventStoreTests.cs
@@ -536,7 +536,7 @@ private static EventData CreateEventData(int i)
                 await subscriptionRunning();
             }
 
-            using (var cts = new CancellationTokenSource(30000))
+            using (var cts = new CancellationTokenSource(60_000))
             {
                 while (!cts.IsCancellationRequested)
                 {

diff --git a/events/Squidex.Events.Tests/MariaDbEventStoreFixture.cs b/events/Squidex.Events.Tests/MariaDbEventStoreFixture.cs
@@ -50,7 +50,10 @@ public async Task InitializeAsync()
             {
                 b.UseMySql(mariaDb.GetConnectionString(), ServerVersion.AutoDetect(mariaDb.GetConnectionString()));
             })
-            .AddEntityFrameworkEventStore<TestContext>(TestHelpers.Configuration)
+            .AddEntityFrameworkEventStore<TestContext>(TestHelpers.Configuration, options =>
+            {
+                options.PollingInterval = TimeSpan.FromSeconds(0.1);
+            })
             .AddMysqlAdapter()
             .Services
             .BuildServiceProvider();

diff --git a/events/Squidex.Events.Tests/MongoEventStoreReplicaFixture.cs b/events/Squidex.Events.Tests/MongoEventStoreReplicaFixture.cs
@@ -43,7 +43,10 @@ public async Task InitializeAsync()
         services = new ServiceCollection()
             .AddSingleton<IMongoClient>(_ => new MongoClient(mongoDb.GetConnectionString()))
             .AddSingleton(c => c.GetRequiredService<IMongoClient>().GetDatabase("Test"))
-            .AddMongoEventStore(TestHelpers.Configuration)
+            .AddMongoEventStore(TestHelpers.Configuration, options =>
+            {
+                options.PollingInterval = TimeSpan.FromSeconds(0.1);
+            })
             .Services
             .BuildServiceProvider();
 

diff --git a/events/Squidex.Events.Tests/MongoEventStoreStandaloneFixture.cs b/events/Squidex.Events.Tests/MongoEventStoreStandaloneFixture.cs
@@ -42,7 +42,10 @@ public async Task InitializeAsync()
         services = new ServiceCollection()
             .AddSingleton<IMongoClient>(_ => new MongoClient(mongoDb.GetConnectionString()))
             .AddSingleton(c => c.GetRequiredService<IMongoClient>().GetDatabase("Test"))
-            .AddMongoEventStore(TestHelpers.Configuration)
+            .AddMongoEventStore(TestHelpers.Configuration, options =>
+            {
+                options.PollingInterval = TimeSpan.FromSeconds(0.1);
+            })
             .Services
             .BuildServiceProvider();
 

diff --git a/events/Squidex.Events.Tests/MysqlEventStoreFixture.cs b/events/Squidex.Events.Tests/MysqlEventStoreFixture.cs
@@ -50,7 +50,10 @@ public async Task InitializeAsync()
             {
                 b.UseMySql(mysql.GetConnectionString(), ServerVersion.AutoDetect(mysql.GetConnectionString()));
             })
-            .AddEntityFrameworkEventStore<TestContext>(TestHelpers.Configuration)
+            .AddEntityFrameworkEventStore<TestContext>(TestHelpers.Configuration, options =>
+            {
+                options.PollingInterval = TimeSpan.FromSeconds(0.1);
+            })
             .AddMysqlAdapter()
             .Services
             .BuildServiceProvider();

diff --git a/events/Squidex.Events.Tests/PostgresEventStoreFixture.cs b/events/Squidex.Events.Tests/PostgresEventStoreFixture.cs
@@ -49,7 +49,10 @@ public async Task InitializeAsync()
             {
                b.UseNpgsql(postgresSql.GetConnectionString());
             })
-            .AddEntityFrameworkEventStore<TestContext>(TestHelpers.Configuration)
+            .AddEntityFrameworkEventStore<TestContext>(TestHelpers.Configuration, options =>
+            {
+                options.PollingInterval = TimeSpan.FromSeconds(0.1);
+            })
             .AddPostgresAdapter()
             .Services
             .BuildServiceProvider();

diff --git a/events/Squidex.Events.Tests/SqlServerEventStoreFixture.cs b/events/Squidex.Events.Tests/SqlServerEventStoreFixture.cs
@@ -48,7 +48,10 @@ public async Task InitializeAsync()
             {
                 b.UseSqlServer(msSql.GetConnectionString());
             })
-            .AddEntityFrameworkEventStore<TestContext>(TestHelpers.Configuration)
+            .AddEntityFrameworkEventStore<TestContext>(TestHelpers.Configuration, options =>
+            {
+                options.PollingInterval = TimeSpan.FromSeconds(0.1);
+            })
             .AddSqlServerAdapter()
             .Services
             .BuildServiceProvider();

diff --git a/events/Squidex.Events/PollingSubscription.cs b/events/Squidex.Events/PollingSubscription.cs
@@ -27,10 +27,23 @@ public PollingSubscription(
         {
             try
             {
-                await foreach (var storedEvent in eventStore.QueryAllAsync(streamFilter, streamPosition, ct: ct))
+                while (true)
                 {
-                    await eventSubscriber.OnNextAsync(this, storedEvent);
-                    streamPosition = storedEvent.EventPosition;
+                    var hasAddedEvent = false;
+                    await foreach (var storedEvent in eventStore.QueryAllAsync(streamFilter, streamPosition, ct: ct))
+                    {
+                        await eventSubscriber.OnNextAsync(this, storedEvent);
+
+                        streamPosition = storedEvent.EventPosition;
+                        hasAddedEvent = true;
+                    }
+
+                    if (!hasAddedEvent)
+                    {
+                        break;
+                    }
+
+                    await Task.Delay(100, ct);
                 }
             }
             catch (Exception ex)