Handle the case where a htmlrunner command times out

Author: shs96c

java/server/src/org/openqa/selenium/server/htmlrunner/NonReflectiveSteps.java

@@ -31,7 +31,7 @@ class NonReflectiveSteps {
   private static final Logger LOG = Logger.getLogger("Selenium Core Step");
 
   private static Supplier<ImmutableMap<String, CoreStepFactory>> STEPS =
-    Suppliers.memoize(() -> build());
+    Suppliers.memoize(NonReflectiveSteps::build);
 
   public ImmutableMap<String, CoreStepFactory> get() {
     return STEPS.get();
@@ -42,10 +42,14 @@ private static ImmutableMap<String, CoreStepFactory> build() {
 
     CoreStepFactory nextCommandFails = (locator, value) ->
       (selenium, state) -> new NextCommandFails();
-
     steps.put("assertErrorOnNext", nextCommandFails);
     steps.put("assertFailureOnNext", nextCommandFails);
 
+    CoreStepFactory verifyNextCommandFails = (locator, value) ->
+      (selenium, state) -> new VerifyNextCommandFails();
+    steps.put("verifyErrorOnNext", verifyNextCommandFails);
+    steps.put("verifyFailureOnNext", verifyNextCommandFails);
+
     steps.put("echo", ((locator, value) -> (selenium, state) -> {
       LOG.info(locator);
       return NextStepDecorator.IDENTITY;
@@ -91,4 +95,23 @@ public boolean isOkayToContinueTest() {
       return true;
     }
   }
+
+  private static class VerifyNextCommandFails extends NextStepDecorator {
+
+    @Override
+    public NextStepDecorator evaluate(CoreStep nextStep, Selenium selenium, TestState state) {
+      NextStepDecorator actualResult = nextStep.execute(selenium, state);
+
+      // This is kind of fragile. Oh well.
+      if (actualResult.equals(NextStepDecorator.IDENTITY)) {
+        return NextStepDecorator.VERIFICATION_FAILED;
+      }
+      return NextStepDecorator.IDENTITY;
+    }
+
+    @Override
+    public boolean isOkayToContinueTest() {
+      return true;
+    }
+  }
 }

java/server/src/org/openqa/selenium/server/htmlrunner/ReflectivelyDiscoveredSteps.java

@@ -25,6 +25,7 @@
 import com.thoughtworks.selenium.SeleneseTestBase;
 import com.thoughtworks.selenium.Selenium;
 import com.thoughtworks.selenium.SeleniumException;
+import com.thoughtworks.selenium.Wait;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -224,6 +225,9 @@ private static NextStepDecorator invokeMethod(Method method, Selenium selenium,
         if (cause instanceof SeleniumException) {
           return NextStepDecorator.ERROR(cause);
         }
+        if (cause instanceof Wait.WaitTimedOutException) {
+          return NextStepDecorator.ERROR(cause);
+        }
       }
       throw new CoreRunnerError(
         String.format(