Fix CoveringUpSauceErrorsRule: the original exception was lost

When re-creating the driver fails, throw the original exception, and
expose the exception occurred while re-creating the driver as a suppressed exception.

Signed-off-by: Luke Inman-Semerau <[email protected]>

Author: alb-i986

java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java

@@ -168,13 +168,15 @@ public void evaluate() throws Throwable {
     }
 
     private void dealWithSauceFailureIfNecessary(Throwable t) {
-      if (!(t instanceof AssumptionViolatedException) && t.getMessage() != null
-          && (t.getMessage().contains("sauce") || t.getMessage().contains("Sauce"))) {
-        removeDriver();
+      String message = t.getMessage();
+      if (!(t instanceof AssumptionViolatedException) && message != null
+          && (message.contains("sauce") || message.contains("Sauce"))) {
         try {
+          removeDriver();
           createDriver();
         } catch (Exception e) {
-          throw new RuntimeException("Exception creating driver, after Sauce-detected exception", e);
+          t.addSuppressed(e);
+          throw new RuntimeException("Sauce-related failure. Tried re-creating the driver, but that failed too.", t);
         }
       } else {
         throw Throwables.propagate(t);