Add retry and continue tweaking tests

Author: amaitland

lib/PuppeteerSharp.Tests/Attributes/PuppeteerRetryFactAttribute.cs

@@ -0,0 +1,18 @@
+using xRetry;
+
+namespace PuppeteerSharp.Tests.Attributes
+{
+    /// <summary>
+    /// Puppeteer Fact
+    /// </summary>
+    public class PuppeteerRetryFactAttribute : RetryFactAttribute
+    {
+        /// <summary>
+        /// Creates a new <seealso cref="PuppeteerRetryFactAttribute"/>
+        /// </summary>
+        public PuppeteerRetryFactAttribute()
+        {
+            Timeout = System.Diagnostics.Debugger.IsAttached ? TestConstants.DebuggerAttachedTestTimeout : TestConstants.DefaultTestTimeout;
+        }
+    }
+}

lib/PuppeteerSharp.Tests/CefSharp.Dom.Tests.csproj

@@ -29,7 +29,8 @@
 		<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
 		<PackageReference Include="System.Net.Http" Version="4.3.4" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-		<PackageReference Include="xunit" Version="2.4.1" />
+		<PackageReference Include="xRetry" Version="1.9.0" />
+		<PackageReference Include="xunit" Version="2.4.2" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

lib/PuppeteerSharp.Tests/NavigationTests/DevToolsContextWaitForNavigationTests.cs

@@ -32,7 +32,7 @@ await Task.WhenAll(
         }
 
         [PuppeteerTest("navigation.spec.ts", "Page.waitForNavigation", "should work with both domcontentloaded and load")]
-        [PuppeteerFact]
+        [PuppeteerRetryFact()]
         public async Task ShouldWorkWithBothDomcontentloadedAndLoad()
         {
             var responseCompleted = new TaskCompletionSource<bool>();
@@ -58,7 +58,7 @@ public async Task ShouldWorkWithBothDomcontentloadedAndLoad()
                 }
             }).ContinueWith(_ => bothFired = true);
 
-            await waitForRequestTask.WithTimeout();
+            await waitForRequestTask.WithTimeout(5_000);
             await domContentLoadedTask.WithTimeout();
             Assert.False(bothFired);
             responseCompleted.SetResult(true);

lib/PuppeteerSharp.Tests/NetworkTests/NetworkEventTests.cs

@@ -28,7 +28,7 @@ public async Task PageEventsRequest()
             var requests = new List<Request>();
             DevToolsContext.Request += (_, e) =>
             {
-                if (!e.Request.Url.EndsWith("favicon.ico"))
+                if (!TestUtils.IsFavicon(e.Request))
                 {
                     requests.Add(e.Request);
                 }
@@ -60,7 +60,13 @@ public async Task PageEventsRequestServedFromCache()
         public async Task PageEventsResponse()
         {
             var responses = new List<Response>();
-            DevToolsContext.Response += (_, e) => responses.Add(e.Response);
+            DevToolsContext.Response += (_, e) =>
+            {
+                if (!TestUtils.IsFavicon(e.Response.Request))
+                {
+                    responses.Add(e.Response);
+                }
+            };
             await DevToolsContext.GoToAsync(TestConstants.EmptyPage);
             Assert.Single(responses);
             Assert.Equal(TestConstants.EmptyPage, responses[0].Url);