Merge branch 'trunk' into null-pinned-script

nvborisenko · web-flow · commit 8cd1cc84b92b · 2024-11-19T00:55:35.000+03:00
diff --git a/dotnet/test/chrome/ChromeSpecificTests.cs b/dotnet/test/chrome/ChromeSpecificTests.cs
@@ -19,17 +19,18 @@
 
 using NUnit.Framework;
 using OpenQA.Selenium.Environment;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Chrome
 {
     [TestFixture]
     public class ChromeSpecificTests : DriverTestFixture
     {
         [OneTimeTearDown]
-        public void RunAfterAnyTests()
+        public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
-            EnvironmentManager.Instance.WebServer.Stop();
+            await EnvironmentManager.Instance.WebServer.StopAsync();
         }
     }
 }
diff --git a/dotnet/test/common/AssemblyFixture.cs b/dotnet/test/common/AssemblyFixture.cs
@@ -19,6 +19,7 @@
 
 using NUnit.Framework;
 using OpenQA.Selenium.Environment;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium
 {
@@ -31,25 +32,25 @@ public AssemblyFixture()
         }
 
         [OneTimeSetUp]
-        public void RunBeforeAnyTest()
+        public async Task RunBeforeAnyTestAsync()
         {
             Internal.Logging.Log.SetLevel(Internal.Logging.LogEventLevel.Trace);
 
-            EnvironmentManager.Instance.WebServer.Start();
+            await EnvironmentManager.Instance.WebServer.StartAsync();
             if (EnvironmentManager.Instance.Browser == Browser.Remote)
             {
-                EnvironmentManager.Instance.RemoteServer.Start();
+                await EnvironmentManager.Instance.RemoteServer.StartAsync();
             }
         }
 
         [OneTimeTearDown]
-        public void RunAfterAnyTests()
+        public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
-            EnvironmentManager.Instance.WebServer.Stop();
+            await EnvironmentManager.Instance.WebServer.StopAsync();
             if (EnvironmentManager.Instance.Browser == Browser.Remote)
             {
-                EnvironmentManager.Instance.RemoteServer.Stop();
+                await EnvironmentManager.Instance.RemoteServer.StopAsync();
             }
         }
     }
diff --git a/dotnet/test/common/Environment/EnvironmentManager.cs b/dotnet/test/common/Environment/EnvironmentManager.cs
@@ -199,11 +199,11 @@ private EnvironmentManager()
         {
             if (remoteServer != null)
             {
-                remoteServer.Stop();
+                remoteServer.StopAsync().Wait();
             }
             if (webServer != null)
             {
-                webServer.Stop();
+                webServer.StopAsync().Wait();
             }
             CloseCurrentDriver();
         }
diff --git a/dotnet/test/common/Environment/RemoteSeleniumServer.cs b/dotnet/test/common/Environment/RemoteSeleniumServer.cs
@@ -22,6 +22,7 @@
 using System.IO;
 using System.Net;
 using System.Net.Http;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Environment
 {
@@ -38,7 +39,7 @@ public RemoteSeleniumServer(string projectRoot, bool autoStartServer)
             autoStart = autoStartServer;
         }
 
-        public void Start()
+        public async Task StartAsync()
         {
             if (autoStart && (webserverProcess == null || webserverProcess.HasExited))
             {
@@ -67,7 +68,7 @@ public void Start()
                 {
                     try
                     {
-                        using var response = httpClient.GetAsync("http://localhost:6000/wd/hub/status").GetAwaiter().GetResult();
+                        using var response = await httpClient.GetAsync("http://localhost:6000/wd/hub/status");
 
                         if (response.StatusCode == HttpStatusCode.OK)
                         {
@@ -86,15 +87,15 @@ public void Start()
             }
         }
 
-        public void Stop()
+        public async Task StopAsync()
         {
             if (autoStart && webserverProcess != null && !webserverProcess.HasExited)
             {
                 using var httpClient = new HttpClient();
 
                 try
                 {
-                    using var response = httpClient.GetAsync("http://localhost:6000/selenium-server/driver?cmd=shutDownSeleniumServer").GetAwaiter().GetResult();
+                    using var response = await httpClient.GetAsync("http://localhost:6000/selenium-server/driver?cmd=shutDownSeleniumServer");
                 }
                 catch (Exception ex) when (ex is HttpRequestException || ex is TimeoutException)
                 {
diff --git a/dotnet/test/common/Environment/TestWebServer.cs b/dotnet/test/common/Environment/TestWebServer.cs
@@ -25,6 +25,7 @@
 using System.Net.Http;
 using System.Runtime.InteropServices;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Environment
 {
@@ -50,7 +51,7 @@ public TestWebServer(string projectRoot, TestWebServerConfig config)
             this.port = config.Port;
         }
 
-        public void Start()
+        public async Task StartAsync()
         {
             if (webserverProcess == null || webserverProcess.HasExited)
             {
@@ -146,7 +147,7 @@ public void Start()
                 {
                     try
                     {
-                        using var response = httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("simpleTest.html")).GetAwaiter().GetResult();
+                        using var response = await httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("simpleTest.html"));
 
                         if (response.StatusCode == HttpStatusCode.OK)
                         {
@@ -174,15 +175,15 @@ public void Start()
             }
         }
 
-        public void Stop()
+        public async Task StopAsync()
         {
             if (webserverProcess != null)
             {
                 using (var httpClient = new HttpClient())
                 {
                     try
                     {
-                        using (httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")).GetAwaiter().GetResult())
+                        using (await httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")))
                         {
 
                         }
diff --git a/dotnet/test/edge/AssemblyTeardown.cs b/dotnet/test/edge/AssemblyTeardown.cs
@@ -19,6 +19,7 @@
 
 using NUnit.Framework;
 using OpenQA.Selenium.Environment;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Edge
 {
@@ -27,16 +28,16 @@ namespace OpenQA.Selenium.Edge
     public class MySetUpClass
     {
         [OneTimeSetUp]
-        public void RunBeforeAnyTest()
+        public async Task RunBeforeAnyTestAsync()
         {
-            EnvironmentManager.Instance.WebServer.Start();
+            await EnvironmentManager.Instance.WebServer.StartAsync();
         }
 
         [OneTimeTearDown]
-        public void RunAfterAnyTests()
+        public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
-            EnvironmentManager.Instance.WebServer.Stop();
+            await EnvironmentManager.Instance.WebServer.StopAsync();
         }
     }
 }
diff --git a/dotnet/test/firefox/AssemblyTeardown.cs b/dotnet/test/firefox/AssemblyTeardown.cs
@@ -19,6 +19,7 @@
 
 using NUnit.Framework;
 using OpenQA.Selenium.Environment;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Firefox
 {
@@ -27,16 +28,16 @@ namespace OpenQA.Selenium.Firefox
     public class MySetUpClass
     {
         [OneTimeSetUp]
-        public void RunBeforeAnyTest()
+        public async Task RunBeforeAnyTestAsync()
         {
-            EnvironmentManager.Instance.WebServer.Start();
+            await EnvironmentManager.Instance.WebServer.StartAsync();
         }
 
         [OneTimeTearDown]
-        public void RunAfterAnyTests()
+        public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
-            EnvironmentManager.Instance.WebServer.Stop();
+            await EnvironmentManager.Instance.WebServer.StopAsync();
         }
     }
 }
diff --git a/dotnet/test/ie/AssemblyTeardown.cs b/dotnet/test/ie/AssemblyTeardown.cs
@@ -19,6 +19,7 @@
 
 using NUnit.Framework;
 using OpenQA.Selenium.Environment;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.IE
 {
@@ -27,16 +28,16 @@ namespace OpenQA.Selenium.IE
     public class MySetUpClass
     {
         [OneTimeSetUp]
-        public void RunBeforeAnyTest()
+        public async Task RunBeforeAnyTestAsync()
         {
-            EnvironmentManager.Instance.WebServer.Start();
+            await EnvironmentManager.Instance.WebServer.StartAsync();
         }
 
         [OneTimeTearDown]
-        public void RunAfterAnyTests()
+        public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
-            EnvironmentManager.Instance.WebServer.Stop();
+            await EnvironmentManager.Instance.WebServer.StopAsync();
         }
     }
 }
diff --git a/dotnet/test/remote/AssemblyTeardown.cs b/dotnet/test/remote/AssemblyTeardown.cs
@@ -19,6 +19,7 @@
 
 using NUnit.Framework;
 using OpenQA.Selenium.Environment;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Remote
 {
@@ -27,23 +28,23 @@ namespace OpenQA.Selenium.Remote
     public class MySetUpClass
     {
         [OneTimeSetUp]
-        public void RunBeforeAnyTest()
+        public async Task RunBeforeAnyTestAsync()
         {
-            EnvironmentManager.Instance.WebServer.Start();
+            await EnvironmentManager.Instance.WebServer.StartAsync();
             if (EnvironmentManager.Instance.Browser == Browser.Remote)
             {
-                EnvironmentManager.Instance.RemoteServer.Start();
+                await EnvironmentManager.Instance.RemoteServer.StartAsync();
             }
         }
 
         [OneTimeTearDown]
-        public void RunAfterAnyTests()
+        public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
-            EnvironmentManager.Instance.WebServer.Stop();
+            await EnvironmentManager.Instance.WebServer.StopAsync();
             if (EnvironmentManager.Instance.Browser == Browser.Remote)
             {
-                EnvironmentManager.Instance.RemoteServer.Stop();
+                await EnvironmentManager.Instance.RemoteServer.StopAsync();
             }
         }
     }
diff --git a/dotnet/test/support/UI/PopupWindowFinderTest.cs b/dotnet/test/support/UI/PopupWindowFinderTest.cs
@@ -19,6 +19,7 @@
 
 using NUnit.Framework;
 using OpenQA.Selenium.Environment;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Support.UI
 {
@@ -27,16 +28,16 @@ public class PopupWindowFinderTest : DriverTestFixture
     {
         //TODO: Move these to a standalone class when more tests rely on the server being up
         [OneTimeSetUp]
-        public void RunBeforeAnyTest()
+        public async Task RunBeforeAnyTestAsync()
         {
-            EnvironmentManager.Instance.WebServer.Start();
+            await EnvironmentManager.Instance.WebServer.StartAsync();
         }
 
         [OneTimeTearDown]
-        public void RunAfterAnyTests()
+        public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
-            EnvironmentManager.Instance.WebServer.Stop();
+            await EnvironmentManager.Instance.WebServer.StopAsync();
         }
 
         [Test]
diff --git a/dotnet/test/support/UI/SelectBrowserTests.cs b/dotnet/test/support/UI/SelectBrowserTests.cs
@@ -21,23 +21,24 @@
 using OpenQA.Selenium.Environment;
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace OpenQA.Selenium.Support.UI
 {
     [TestFixture]
     public class SelectBrowserTests : DriverTestFixture
     {
         [OneTimeSetUp]
-        public void RunBeforeAnyTest()
+        public async Task RunBeforeAnyTestAsync()
         {
-            EnvironmentManager.Instance.WebServer.Start();
+            await EnvironmentManager.Instance.WebServer.StartAsync();
         }
 
         [OneTimeTearDown]
-        public void RunAfterAnyTests()
+        public async Task RunAfterAnyTestsAsync()
         {
             EnvironmentManager.Instance.CloseCurrentDriver();
-            EnvironmentManager.Instance.WebServer.Stop();
+            await EnvironmentManager.Instance.WebServer.StopAsync();
         }
 
         [SetUp]

Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,18 @@`
`19`	`19`
`20`	`20`	`using NUnit.Framework;`
`21`	`21`	`using OpenQA.Selenium.Environment;`
	`22`	`+using System.Threading.Tasks;`
`22`	`23`
`23`	`24`	`namespace OpenQA.Selenium.Chrome`
`24`	`25`	`{`
`25`	`26`	`[TestFixture]`
`26`	`27`	`public class ChromeSpecificTests : DriverTestFixture`
`27`	`28`	`{`
`28`	`29`	`[OneTimeTearDown]`
`29`		`- public void RunAfterAnyTests()`
	`30`	`+ public async Task RunAfterAnyTestsAsync()`
`30`	`31`	`{`
`31`	`32`	`EnvironmentManager.Instance.CloseCurrentDriver();`
`32`		`- EnvironmentManager.Instance.WebServer.Stop();`
	`33`	`+ await EnvironmentManager.Instance.WebServer.StopAsync();`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`using NUnit.Framework;`
`21`	`21`	`using OpenQA.Selenium.Environment;`
	`22`	`+using System.Threading.Tasks;`
`22`	`23`
`23`	`24`	`namespace OpenQA.Selenium`
`24`	`25`	`{`
`@@ -31,25 +32,25 @@ public AssemblyFixture()`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`[OneTimeSetUp]`
`34`		`- public void RunBeforeAnyTest()`
	`35`	`+ public async Task RunBeforeAnyTestAsync()`
`35`	`36`	`{`
`36`	`37`	`Internal.Logging.Log.SetLevel(Internal.Logging.LogEventLevel.Trace);`
`37`	`38`
`38`		`- EnvironmentManager.Instance.WebServer.Start();`
	`39`	`+ await EnvironmentManager.Instance.WebServer.StartAsync();`
`39`	`40`	`if (EnvironmentManager.Instance.Browser == Browser.Remote)`
`40`	`41`	`{`
`41`		`- EnvironmentManager.Instance.RemoteServer.Start();`
	`42`	`+ await EnvironmentManager.Instance.RemoteServer.StartAsync();`
`42`	`43`	`}`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`[OneTimeTearDown]`
`46`		`- public void RunAfterAnyTests()`
	`47`	`+ public async Task RunAfterAnyTestsAsync()`
`47`	`48`	`{`
`48`	`49`	`EnvironmentManager.Instance.CloseCurrentDriver();`
`49`		`- EnvironmentManager.Instance.WebServer.Stop();`
	`50`	`+ await EnvironmentManager.Instance.WebServer.StopAsync();`
`50`	`51`	`if (EnvironmentManager.Instance.Browser == Browser.Remote)`
`51`	`52`	`{`
`52`		`- EnvironmentManager.Instance.RemoteServer.Stop();`
	`53`	`+ await EnvironmentManager.Instance.RemoteServer.StopAsync();`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,11 +199,11 @@ private EnvironmentManager()`
`199`	`199`	`{`
`200`	`200`	`if (remoteServer != null)`
`201`	`201`	`{`
`202`		`- remoteServer.Stop();`
	`202`	`+ remoteServer.StopAsync().Wait();`
`203`	`203`	`}`
`204`	`204`	`if (webServer != null)`
`205`	`205`	`{`
`206`		`- webServer.Stop();`
	`206`	`+ webServer.StopAsync().Wait();`
`207`	`207`	`}`
`208`	`208`	`CloseCurrentDriver();`
`209`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`using System.IO;`
`23`	`23`	`using System.Net;`
`24`	`24`	`using System.Net.Http;`
	`25`	`+using System.Threading.Tasks;`
`25`	`26`
`26`	`27`	`namespace OpenQA.Selenium.Environment`
`27`	`28`	`{`
`@@ -38,7 +39,7 @@ public RemoteSeleniumServer(string projectRoot, bool autoStartServer)`
`38`	`39`	`autoStart = autoStartServer;`
`39`	`40`	`}`
`40`	`41`
`41`		`- public void Start()`
	`42`	`+ public async Task StartAsync()`
`42`	`43`	`{`
`43`	`44`	`if (autoStart && (webserverProcess == null \|\| webserverProcess.HasExited))`
`44`	`45`	`{`
`@@ -67,7 +68,7 @@ public void Start()`
`67`	`68`	`{`
`68`	`69`	`try`
`69`	`70`	`{`
`70`		`- using var response = httpClient.GetAsync("http://localhost:6000/wd/hub/status").GetAwaiter().GetResult();`
	`71`	`+ using var response = await httpClient.GetAsync("http://localhost:6000/wd/hub/status");`
`71`	`72`
`72`	`73`	`if (response.StatusCode == HttpStatusCode.OK)`
`73`	`74`	`{`
`@@ -86,15 +87,15 @@ public void Start()`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`
`89`		`- public void Stop()`
	`90`	`+ public async Task StopAsync()`
`90`	`91`	`{`
`91`	`92`	`if (autoStart && webserverProcess != null && !webserverProcess.HasExited)`
`92`	`93`	`{`
`93`	`94`	`using var httpClient = new HttpClient();`
`94`	`95`
`95`	`96`	`try`
`96`	`97`	`{`
`97`		`- using var response = httpClient.GetAsync("http://localhost:6000/selenium-server/driver?cmd=shutDownSeleniumServer").GetAwaiter().GetResult();`
	`98`	`+ using var response = await httpClient.GetAsync("http://localhost:6000/selenium-server/driver?cmd=shutDownSeleniumServer");`
`98`	`99`	`}`
`99`	`100`	`catch (Exception ex) when (ex is HttpRequestException \|\| ex is TimeoutException)`
`100`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`using System.Net.Http;`
`26`	`26`	`using System.Runtime.InteropServices;`
`27`	`27`	`using System.Text;`
	`28`	`+using System.Threading.Tasks;`
`28`	`29`
`29`	`30`	`namespace OpenQA.Selenium.Environment`
`30`	`31`	`{`
`@@ -50,7 +51,7 @@ public TestWebServer(string projectRoot, TestWebServerConfig config)`
`50`	`51`	`this.port = config.Port;`
`51`	`52`	`}`
`52`	`53`
`53`		`- public void Start()`
	`54`	`+ public async Task StartAsync()`
`54`	`55`	`{`
`55`	`56`	`if (webserverProcess == null \|\| webserverProcess.HasExited)`
`56`	`57`	`{`
`@@ -146,7 +147,7 @@ public void Start()`
`146`	`147`	`{`
`147`	`148`	`try`
`148`	`149`	`{`
`149`		`- using var response = httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("simpleTest.html")).GetAwaiter().GetResult();`
	`150`	`+ using var response = await httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("simpleTest.html"));`
`150`	`151`
`151`	`152`	`if (response.StatusCode == HttpStatusCode.OK)`
`152`	`153`	`{`
`@@ -174,15 +175,15 @@ public void Start()`
`174`	`175`	`}`
`175`	`176`	`}`
`176`	`177`
`177`		`- public void Stop()`
	`178`	`+ public async Task StopAsync()`
`178`	`179`	`{`
`179`	`180`	`if (webserverProcess != null)`
`180`	`181`	`{`
`181`	`182`	`using (var httpClient = new HttpClient())`
`182`	`183`	`{`
`183`	`184`	`try`
`184`	`185`	`{`
`185`		`- using (httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")).GetAwaiter().GetResult())`
	`186`	`+ using (await httpClient.GetAsync(EnvironmentManager.Instance.UrlBuilder.LocalWhereIs("quitquitquit")))`
`186`	`187`	`{`
`187`	`188`
`188`	`189`	`}`