Merge pull request #2286 from zebrunner/develop

1.2.11
zebrunner · Oct 24, 2024 · 93bc56b · 93bc56b
2 parents 06694d2 + 7bf4cc1
commit 93bc56b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>11</java.version>
-        <carina-webdriver.version>1.2.11</carina-webdriver.version>
+        <carina-webdriver.version>1.2.12</carina-webdriver.version>
         <!-- Logging -->
         <slf4j.version>1.7.30</slf4j.version>
         <log4j.version>2.17.1</log4j.version>
@@ -66,7 +66,7 @@
          <repository>
              <id>zebrunner_snapshots</id>
              <name>zebrunner Snapshots</name>
-             <url>https://nexus.zebrunner.dev/repository/ce-snapshots/</url>
+             <url>https://public-nexus.zebrunner.com/repository/ce-snapshots/</url>
              <releases>
                  <enabled>false</enabled>
              </releases>
@@ -361,7 +361,7 @@
         <snapshotRepository>
             <id>ZBR_Nexus</id>
             <name>Zebrunner Snapshots</name>
-            <url>https://nexus.zebrunner.dev/repository/ce-snapshots/</url>
+            <url>https://public-nexus.zebrunner.com/repository/ce-snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 </project>
diff --git a/src/main/java/com/zebrunner/carina/core/listeners/CarinaListener.java b/src/main/java/com/zebrunner/carina/core/listeners/CarinaListener.java
@@ -19,24 +19,31 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import com.zebrunner.agent.core.config.provider.SystemPropertiesConfigurationProvider;
 import com.zebrunner.agent.core.webdriver.CapabilitiesCustomizerChain;
+import com.zebrunner.carina.webdriver.IDriverPool;
 import com.zebrunner.carina.webdriver.core.capability.CarinaCapabilitiesCustomizer;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.reflect.ConstructorUtils;
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.LoggerContext;
@@ -757,7 +764,7 @@ private void attachTestRunLabels(ISuite suite) {
      * 
      */
     private void takeScreenshot() {
-        ConcurrentHashMap<String, CarinaDriver> drivers = getDrivers();
+        Map<String, CarinaDriver> drivers = IDriverPool.getDrivers();
         try {
             for (Map.Entry<String, CarinaDriver> entry : drivers.entrySet()) {
                 WebDriver drv = entry.getValue().getDriver();
@@ -772,30 +779,26 @@ public static class ShutdownHook extends Thread {
 
         private static final Logger LOGGER = LoggerFactory.getLogger(ShutdownHook.class);
 
-        private void quitAllDriversOnHook() {
-            // as it is shutdown hook just try to quit all existing drivers one by one
-            for (CarinaDriver carinaDriver : driversPool) {
-                // it is expected that all drivers are killed in appropriate AfterMethod/Class/Suite blocks
-                String name = carinaDriver.getName();
-                LOGGER.warn("Trying to quit driver '{}' on shutdown hook action!", name);
-                carinaDriver.getDevice().disconnectRemote();
-                try {
-                    LOGGER.debug("Driver closing...{}", name);
-                    carinaDriver.getDriver().close();
-                    LOGGER.debug("Driver exiting...{}", name);
-                    carinaDriver.getDriver().quit();
-                    LOGGER.debug("Driver exited...{}", name);
-                } catch (Exception e) {
-                    // do nothing
-                }
+        private void quitAllDriversOnHook() throws InterruptedException {
+            List<ImmutablePair<Long, String>> drivers4Close = new ArrayList<>();
+            for (Map<String, CarinaDriver> drivers : IDriverPool.DRIVERS_POOL.values()) {
+                drivers.keySet().forEach(key -> drivers4Close.add(new ImmutablePair<>(drivers.get(key).getThreadId(), key)));
             }
+            drivers4Close.forEach(driver -> IDriverPool.quitDriver(driver.getRight(), driver.getLeft()));
+            IDriverPool.EXECUTOR_SERVICE.shutdown();
+
+            IDriverPool.EXECUTOR_SERVICE.awaitTermination(10, TimeUnit.MINUTES);
         }
 
         @Override
         public void run() {
             LOGGER.debug("Running shutdown hook");
             if (!Configuration.get(TestConfiguration.Parameter.FORCIBLY_DISABLE_DRIVER_QUIT, Boolean.class).orElse(false)) {
-                quitAllDriversOnHook();
+                try {
+                    quitAllDriversOnHook();
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
             }
         }