speed up slow tests (#617)

Author: bruno-garcia

test/Sentry.NLog.Tests/SentryTargetTests.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using NLog;
 using NLog.Common;
@@ -471,17 +472,19 @@ public async Task LogManager_WhenFlushCalled_CallsSentryFlushAsync()
 
             var testDisposable = Substitute.For<IDisposable>();
 
+            var evt = new ManualResetEventSlim();
             AsyncContinuation continuation = e =>
             {
                 testDisposable.Dispose();
+                evt.Set();
             };
 
             factory.Flush(continuation, timeout);
 
-            await Task.Delay(timeout);
+            Assert.True(evt.Wait(timeout));
 
             testDisposable.Received().Dispose();
-            hub.Received().FlushAsync(Arg.Any<TimeSpan>()).GetAwaiter().GetResult();
+            await hub.Received().FlushAsync(Arg.Any<TimeSpan>());
         }
 
         [Fact]

test/Sentry.Tests/Internals/Http/CachingTransportTests.cs

@@ -68,34 +68,36 @@ public async Task EnvelopeReachesInnerTransport()
             sentEnvelope.Should().BeEquivalentTo(envelope, o => o.Excluding(x => x.Items[0].Header));
         }
 
-        [Fact(Timeout = 7000)]
+        [Fact(Timeout = 5000)]
         public async Task MaintainsLimit()
         {
             // Arrange
             using var cacheDirectory = new TempDirectory();
             var options = new SentryOptions
             {
                 CacheDirectoryPath = cacheDirectory.Path,
-                MaxQueueItems = 3
+                MaxQueueItems = 2
             };
 
             var innerTransport = Substitute.For<ITransport>();
 
-            // Introduce enough delay for the cache to overflow under normal circumstances
+            var evt = new ManualResetEventSlim();
+            // Block until we're done
             innerTransport
-                .SendEnvelopeAsync(Arg.Any<Envelope>(), Arg.Any<CancellationToken>())
-                .Returns(Task.Delay(3000));
+                .When(t => t.SendEnvelopeAsync(Arg.Any<Envelope>(), Arg.Any<CancellationToken>()))
+                .Do(_ => evt.Wait());
 
             await using var transport = new CachingTransport(innerTransport, options);
 
             // Act & assert
-            for (var i = 0; i < 20; i++)
+            for (var i = 0; i < options.MaxQueueItems + 2; i++)
             {
                 using var envelope = Envelope.FromEvent(new SentryEvent());
                 await transport.SendEnvelopeAsync(envelope);
 
                 transport.GetCacheLength().Should().BeLessOrEqualTo(options.MaxQueueItems);
             }
+            evt.Set();
         }
 
         [Fact(Timeout = 7000)]