[dotnet] fix test failures by ensuring new driver is created when necessary

titusfortner · titusfortner · commit 91ef191d3dcb · 2023-07-25T12:14:44.000-05:00
diff --git a/dotnet/test/common/DriverTestFixture.cs b/dotnet/test/common/DriverTestFixture.cs
@@ -1,7 +1,7 @@
 using NUnit.Framework;
 using OpenQA.Selenium.Environment;
 using System;
-using OpenQA.Selenium.Remote;
+using static NUnit.Framework.Interfaces.ResultState;
 
 namespace OpenQA.Selenium
 {
@@ -27,7 +27,7 @@ public abstract class DriverTestFixture
         public string javascriptPage = EnvironmentManager.Instance.UrlBuilder.WhereIs("javascriptPage.html");
 
         public string loginPage = EnvironmentManager.Instance.UrlBuilder.WhereIs("login.html");
-        
+
         public string clickEventPage = EnvironmentManager.Instance.UrlBuilder.WhereIs("clickEventPage.html");
 
         public string resultPage = EnvironmentManager.Instance.UrlBuilder.WhereIs("resultPage.html");
@@ -113,7 +113,7 @@ public bool IsNativeEventsEnabled
         [OneTimeSetUp]
         public void SetUp()
         {
-            driver = EnvironmentManager.Instance.GetCurrentDriver();
+            driver = EnvironmentManager.Instance.CreateFreshDriver();
         }
 
         [OneTimeTearDown]
@@ -122,6 +122,15 @@ public void TearDown()
             // EnvironmentManager.Instance.CloseCurrentDriver();
         }
 
+        [TearDown]
+        public void ResetOnError()
+        {
+            if (TestContext.CurrentContext.Result.Outcome == Error)
+            {
+                driver = EnvironmentManager.Instance.CreateFreshDriver();
+            }
+        }
+
         /*
          *  Exists because a given test might require a fresh driver
          */
diff --git a/dotnet/test/common/Environment/EnvironmentManager.cs b/dotnet/test/common/Environment/EnvironmentManager.cs
@@ -138,10 +138,7 @@ private EnvironmentManager()
             {
                 webServer.Stop();
             }
-            if (driver != null)
-            {
-                driver.Quit();
-            }
+            CloseCurrentDriver();
         }
 
         public event EventHandler<DriverStartingEventArgs> DriverStarting;

Original file line number	Diff line number	Diff line change
`@@ -138,10 +138,7 @@ private EnvironmentManager()`
`138`	`138`	`{`
`139`	`139`	`webServer.Stop();`
`140`	`140`	`}`
`141`		`- if (driver != null)`
`142`		`- {`
`143`		`- driver.Quit();`
`144`		`- }`
	`141`	`+ CloseCurrentDriver();`
`145`	`142`	`}`
`146`	`143`
`147`	`144`	`public event EventHandler<DriverStartingEventArgs> DriverStarting;`