Merge branch 'trunk' into py-work-branch

diemol · web-flow · commit 8280b3b0f8a5 · 2023-05-02T12:38:44.000+02:00
diff --git a/java/src/org/openqa/selenium/grid/distributor/GridModel.java b/java/src/org/openqa/selenium/grid/distributor/GridModel.java
@@ -224,8 +224,8 @@ public void purgeDeadNodes() {
         if (node.getAvailability() == UP && lostTime.isBefore(now)) {
           LOG.info(String.format("Switching Node %s from UP to DOWN", node.getExternalUri()));
           replacements.put(node, rewrite(node, DOWN));
-        }
-        if (node.getAvailability() == DOWN && deadTime.isBefore(now)) {
+          nodePurgeTimes.put(id, Instant.now());
+        } else if (node.getAvailability() == DOWN && deadTime.isBefore(now)) {
           LOG.info(String.format("Removing Node %s, DOWN for too long", node.getExternalUri()));
           toRemove.add(node);
         }
diff --git a/java/test/com/thoughtworks/selenium/BaseSuite.java b/java/test/com/thoughtworks/selenium/BaseSuite.java
@@ -38,20 +38,26 @@ public static void setup() {
 
   }
 
+
   @AfterAll
   public static void teardown() {
     // browser
-    log.info("Stopping browser");
+    log.info("Stopping browser...");
     try {
-      InternalSelenseTestBase.destroyDriver();
-    } catch (SeleniumException ignored) {
-      // Nothing sane to do
+        InternalSelenseTestBase.destroyDriver();
+        log.info("Browser stopped successfully.");
+    } catch (SeleniumException e) {
+        log.error("Failed to stop browser: {}", e.getMessage());
     }
 
     // testEnvironment
-    log.info("Cleaning test environment");
-    GlobalTestEnvironment.stop();
-
-  }
+    log.info("Cleaning test environment...");
+    try {
+        GlobalTestEnvironment.stop();
+        log.info("Test environment cleaned successfully.");
+    } catch (Exception e) {
+        log.error("Failed to clean test environment: {}", e.getMessage());
+    }
+}
 
 }
diff --git a/java/test/com/thoughtworks/selenium/HttpCommandProcessorUnitTest.java b/java/test/com/thoughtworks/selenium/HttpCommandProcessorUnitTest.java
@@ -127,6 +127,20 @@ void testGetBooleanArray() {
     assertEquals(boolCmdResults[1], methodResults[1]);
   }
 
+  @Test
+ void testResourcesClosedWhenIoeOnGetOutputStream() {
+    IOEThrowingHttpCommandProcessor cmdProc = new IOEThrowingHttpCommandProcessor(
+            "localhost", 4444, "*chrome", "http://www.google.com");
+    cmdProc.throwIoeOnGetOutputStream = true;
+    try {
+        cmdProc.getCommandResponseAsString("testCommand");
+        fail();
+    } catch (IOException ioe) {
+        cmdProc.verifyClosedResources(false, true, true);
+    }
+}
+
+
   /**
    * Inner class to help mock out the network and pipe connections to verify that they are closed
    * regardless of where IOExceptions occur.
diff --git a/java/test/com/thoughtworks/selenium/condition/ConditionTest.java b/java/test/com/thoughtworks/selenium/condition/ConditionTest.java
@@ -188,6 +188,23 @@ public boolean isTrue(ConditionRunner.Context runner) {
     }
   }
 
+  @Test
+  void testAssertionFailureInConditionIsNotWrapped() {
+    Condition condition = new Condition() {
+        @Override
+        public boolean isTrue(ConditionRunner.Context runner) {
+            double result = 10.0 / 0.0;
+            return false;
+        }
+    };
+    try {
+        conditionRunner.waitFor(condition);
+        fail("should have thrown an assertion failed error");
+    } catch (AssertionError expected) {
+        assertTrue(expected.getMessage().contains("/ by zero"));
+    }
+}
+
   @Test
   void testMessageWithArgs() {
     final RuntimeException thrownException = new RuntimeException();
