Integration tests: add retries to OpenWindowWithClick (#17259)

AvaloniaUI · Oct 22, 2024 · b300ef6 · b300ef6
1 parent 63a4eaf
commit b300ef6
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
@@ -151,7 +151,25 @@ public static IDisposable OpenWindowWithClick(this AppiumWebElement element, Tim
                 if (delay is not null)
                     Thread.Sleep((int)delay.Value.TotalMilliseconds);
 
-                var newHandle = session.WindowHandles.Except(oldHandles).SingleOrDefault();
+                string? newHandle = null;
+                IWebElement? newChildWindow = null;
+
+                for (var i = 0; i < 10; ++i)
+                {
+                    newHandle = session.WindowHandles.Except(oldHandles).SingleOrDefault();
+                    if (newHandle is not null)
+                        break;
+
+                    // If a new window handle hasn't been added to the session then it's likely
+                    // that a child window was opened. These don't appear in session.WindowHandles
+                    // so we have to use an XPath query to get hold of it.
+                    var newChildWindows = session.FindElements(By.XPath("//Window"));
+                    newChildWindow = newChildWindows.Except(oldChildWindows).SingleOrDefault();
+                    if (newChildWindow is not null)
+                        break;
+
+                    Thread.Sleep(100);
+                }
 
                 if (newHandle is not null)
                 {
@@ -164,20 +182,17 @@ public static IDisposable OpenWindowWithClick(this AppiumWebElement element, Tim
                         session.SwitchTo().Window(oldHandle);
                     });
                 }
-                else
-                {
-                    // If a new window handle hasn't been added to the session then it's likely
-                    // that a child window was opened. These don't appear in session.WindowHandles
-                    // so we have to use an XPath query to get hold of it.
-                    var newChildWindows = session.FindElements(By.XPath("//Window"));
-                    var pageSource = session.PageSource;
-                    var childWindow = Assert.Single(newChildWindows.Except(oldChildWindows));
 
+                if (newChildWindow is not null)
+                {
                     return Disposable.Create(() =>
                     {
-                        childWindow.SendKeys(Keys.Alt + Keys.F4 + Keys.Alt);
+                        newChildWindow.SendKeys(Keys.Alt + Keys.F4 + Keys.Alt);
                     });
                 }
+
+                Assert.Fail("Could not find the newly opened window");
+                return Disposable.Empty;
             }
             else
             {