Properly ignoring .NET DevTools tests for non-DevTools browsers

SeleniumHQ · Jul 10, 2019 · 5304b39 · 5304b39
1 parent c346167
commit 5304b39
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/dotnet/test/common/DevTools/DevToolsTestFixture.cs b/dotnet/test/common/DevTools/DevToolsTestFixture.cs
@@ -21,12 +21,15 @@ public bool IsDevToolsSupported
         [SetUp]
         public void Setup()
         {
-            driver = EnvironmentManager.Instance.CreateFreshDriver();
+            driver = EnvironmentManager.Instance.GetCurrentDriver();
             devTools = driver as IDevTools;
-            if (devTools != null)
+            if (devTools == null)
             {
-                session = devTools.CreateDevToolsSession();
+                Assert.Ignore("{0} does not support Chrome DevTools Protocol", EnvironmentManager.Instance.Browser);
+                return;
             }
+
+            session = devTools.CreateDevToolsSession();
         }
 
         [TearDown]
@@ -35,10 +38,9 @@ public void Teardown()
             if (session != null)
             {
                 session.Dispose();
+                EnvironmentManager.Instance.CloseCurrentDriver();
+                driver = null;
             }
-
-            EnvironmentManager.Instance.CloseCurrentDriver();
-            driver = null;
         }
     }
 }