imrpoved logger for carina command executor and added todo for #1361

zebrunner · Nov 26, 2021 · e66e9a2 · e66e9a2
1 parent 85f7b50
commit e66e9a2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...n/java/com/qaprosoft/carina/core/foundation/webdriver/listener/CarinaCommandExecutor.java b/...n/java/com/qaprosoft/carina/core/foundation/webdriver/listener/CarinaCommandExecutor.java
@@ -19,6 +19,7 @@
 import java.lang.invoke.MethodHandles;
 import java.net.URL;
 
+import org.openqa.selenium.NoSuchSessionException;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.remote.Command;
 import org.openqa.selenium.remote.HttpCommandExecutor;
@@ -48,14 +49,18 @@ public Response execute(Command command) throws IOException {
         Number pause = Configuration.getInt(Parameter.EXPLICIT_TIMEOUT) / retry;
         while (retry > 0) {
             response = super.execute(command);
+            String msg = response.getValue().toString();
             if (response.getValue() instanceof WebDriverException) {
-                LOGGER.error("Temp CarinaCommandExecutor catched: " + response.getValue().toString());
-                String msg = response.getValue().toString();
                 if (msg.contains(SpecialKeywords.DRIVER_CONNECTION_REFUSED)
                         || msg.contains(SpecialKeywords.DRIVER_CONNECTION_REFUSED2)) {
-                    LOGGER.warn("Enabled command executor retries: " + msg);
+                    LOGGER.warn("Enabled command executor retries due to the " + SpecialKeywords.DRIVER_CONNECTION_REFUSED);
                     CommonUtils.pause(pause);
                 }
+            } else if (response.getValue() instanceof NoSuchSessionException) {
+                LOGGER.error("Session died! " + msg);
+                //TODO: #1361 don't do driver.quit call if driver wasn't started or was terminated
+                // implement sessionId parser and removal/making existing driver as dead
+                break;
             } else {
                 // do nothing as response already contains all the information we need
                 break;