Add test cancellation

Author: andreasohlund

src/ServiceControl.Audit.Persistence.Tests.RavenDB/IndexSetupTests.cs

@@ -38,7 +38,7 @@ public async Task Free_text_search_index_should_be_used_by_default()
     [Test]
     public async Task Free_text_search_index_can_be_opted_out_from()
     {
-        await DatabaseSetup.CreateIndexes(configuration.DocumentStore, false, CancellationToken.None);
+        await DatabaseSetup.CreateIndexes(configuration.DocumentStore, false, TestTimeoutCancellationToken);
 
         var freeTextIndex = await configuration.DocumentStore.Maintenance.SendAsync(new GetIndexOperation(DatabaseSetup.MessagesViewIndexWithFulltextSearchName));
         var nonFreeTextIndex = await configuration.DocumentStore.Maintenance.SendAsync(new GetIndexOperation(DatabaseSetup.MessagesViewIndexName));
@@ -56,7 +56,7 @@ public async Task Indexes_should_be_reset_on_setup()
 
         Assert.That(indexWithCustomConfigStats.SearchEngineType, Is.EqualTo(SearchEngineType.Lucene));
 
-        await DatabaseSetup.CreateIndexes(configuration.DocumentStore, true, CancellationToken.None);
+        await DatabaseSetup.CreateIndexes(configuration.DocumentStore, true, TestTimeoutCancellationToken);
 
         await WaitForIndexDefinitionUpdate(indexWithCustomConfigStats);
 
@@ -78,7 +78,7 @@ public async Task Indexes_should_not_be_reset_on_setup_when_locked_as_ignore()
 
         Assert.That(indexStatsBefore.SearchEngineType, Is.EqualTo(SearchEngineType.Lucene));
 
-        await DatabaseSetup.CreateIndexes(configuration.DocumentStore, true, CancellationToken.None);
+        await DatabaseSetup.CreateIndexes(configuration.DocumentStore, true, TestTimeoutCancellationToken);
 
         // raven will ignore the update since index was locked, so best we can do is wait a bit and check that settings hasn't changed
         await Task.Delay(1000);
@@ -98,25 +98,25 @@ public async Task Indexes_should_not_be_reset_on_setup_when_locked_as_error()
 
         await UpdateIndex(index);
 
-        Assert.ThrowsAsync<IndexCreationException>(async () => await DatabaseSetup.CreateIndexes(configuration.DocumentStore, true, CancellationToken.None));
+        Assert.ThrowsAsync<IndexCreationException>(async () => await DatabaseSetup.CreateIndexes(configuration.DocumentStore, true, TestTimeoutCancellationToken));
     }
 
-    async Task<IndexStats> UpdateIndex(IAbstractIndexCreationTask index, CancellationToken cancellationToken = default)
+    async Task<IndexStats> UpdateIndex(IAbstractIndexCreationTask index)
     {
-        var statsBefore = await configuration.DocumentStore.Maintenance.SendAsync(new GetIndexStatisticsOperation(index.IndexName), cancellationToken);
+        var statsBefore = await configuration.DocumentStore.Maintenance.SendAsync(new GetIndexStatisticsOperation(index.IndexName), TestTimeoutCancellationToken);
 
-        await IndexCreation.CreateIndexesAsync([index], configuration.DocumentStore, null, null, cancellationToken);
+        await IndexCreation.CreateIndexesAsync([index], configuration.DocumentStore, null, null, TestTimeoutCancellationToken);
 
-        return await WaitForIndexDefinitionUpdate(statsBefore, cancellationToken);
+        return await WaitForIndexDefinitionUpdate(statsBefore);
     }
 
-    async Task<IndexStats> WaitForIndexDefinitionUpdate(IndexStats oldStats, CancellationToken cancellationToken = default)
+    async Task<IndexStats> WaitForIndexDefinitionUpdate(IndexStats oldStats)
     {
         while (true)
         {
             try
             {
-                var newStats = await configuration.DocumentStore.Maintenance.SendAsync(new GetIndexStatisticsOperation(oldStats.Name), cancellationToken);
+                var newStats = await configuration.DocumentStore.Maintenance.SendAsync(new GetIndexStatisticsOperation(oldStats.Name), TestTimeoutCancellationToken);
 
                 if (newStats.CreatedTimestamp > oldStats.CreatedTimestamp)
                 {
@@ -128,7 +128,7 @@ async Task<IndexStats> WaitForIndexDefinitionUpdate(IndexStats oldStats, Cancell
                 // keep going since we can get this if we query right when the update happens
             }
 
-            await Task.Delay(TimeSpan.FromMilliseconds(100), cancellationToken);
+            await Task.Delay(TimeSpan.FromMilliseconds(100), TestTimeoutCancellationToken);
         }
     }
 }

src/ServiceControl.Audit.Persistence.Tests/PersistenceTestFixture.cs

@@ -1,8 +1,10 @@
 namespace ServiceControl.Audit.Persistence.Tests
 {
     using System;
+    using System.Diagnostics;
     using System.IO;
     using System.Linq;
+    using System.Threading;
     using System.Threading.Tasks;
     using Auditing.BodyStorage;
     using NUnit.Framework;
@@ -18,12 +20,15 @@ public virtual Task Setup()
         {
             configuration = new PersistenceTestsConfiguration();
 
+            testCancellationTokenSource = Debugger.IsAttached ? new CancellationTokenSource() : new CancellationTokenSource(TestTimeout);
+
             return configuration.Configure(SetSettings);
         }
 
         [TearDown]
         public virtual Task Cleanup()
         {
+            testCancellationTokenSource?.Dispose();
             return configuration?.Cleanup();
         }
 
@@ -64,5 +69,11 @@ protected ValueTask<IAuditIngestionUnitOfWork> StartAuditUnitOfWork(int batchSiz
         protected IServiceProvider ServiceProvider => configuration.ServiceProvider;
 
         protected PersistenceTestsConfiguration configuration;
+
+        protected CancellationToken TestTimeoutCancellationToken => testCancellationTokenSource.Token;
+
+        CancellationTokenSource testCancellationTokenSource;
+
+        static readonly TimeSpan TestTimeout = TimeSpan.FromSeconds(30);
     }
 }