Defensive check to make sure OperationCanceledException is not thrown; try to make test more robust on slow machines

Author: nblumhardt

src/Serilog.Sinks.PeriodicBatching/Sinks/PeriodicBatching/PeriodicBatchingSink.cs

@@ -228,6 +228,9 @@ async Task<bool> TryWaitToReadAsync(ChannelReader<LogEvent> reader, Task timeout
             return false;
         }
 
+        if (waitToRead.Status is not TaskStatus.RanToCompletion)
+            return false;
+        
         return await waitToRead;
     }
 

test/Serilog.Sinks.PeriodicBatching.Tests/PeriodicBatchingSinkTests.cs

@@ -115,17 +115,16 @@ public void ExecutionContextDoesNotFlowToBatchedSink()
     [InlineData(false)]
     public async Task EagerlyEmitFirstEventCausesQuickInitialBatch(bool eagerlyEmit)
     {
-        long batchesEmitted = 0;
+        var x = new ManualResetEvent(false);
         var bs = new CallbackBatchedSink(_ =>
         {
-            // ReSharper disable once AccessToModifiedClosure
-            Interlocked.Increment(ref batchesEmitted);
+            x.Set();
             return Task.CompletedTask;
         });
 
         var options = new PeriodicBatchingSinkOptions
         {
-            Period = TimeSpan.FromSeconds(2),
+            Period = TimeSpan.FromSeconds(3),
             EagerlyEmitFirstEvent = eagerlyEmit,
             BatchSizeLimit = 10,
             QueueLimit = 1000
@@ -137,14 +136,14 @@ public async Task EagerlyEmitFirstEventCausesQuickInitialBatch(bool eagerlyEmit)
         pbs.Emit(evt);
 
         await Task.Delay(1900);
-        Assert.Equal(eagerlyEmit ? 1L : 0, Interlocked.Read(ref batchesEmitted));
+        Assert.Equal(eagerlyEmit, x.WaitOne(0));
 
 #if FEATURE_ASYNCDISPOSABLE
         await pbs.DisposeAsync();
 #else
         pbs.Dispose();
 #endif
 
-        Assert.Equal(1L, Interlocked.Read(ref batchesEmitted));
+        Assert.True(x.WaitOne(0));
     }
 }