fix

Author: michaelwittig

test/src/test/java/de/widdix/awsec2ssh/ATest.java

@@ -16,7 +16,7 @@
 
 public abstract class ATest {
 
-    protected final <T> T retry(final Context context, final Callable<T> callable) {
+    protected final <T> T retry(final Callable<T> callable) {
         final AtomicInteger t = new AtomicInteger(0);
         final Callable<T> wrapper = () -> {
             try {
@@ -34,13 +34,8 @@ protected final <T> T retry(final Context context, final Callable<T> callable) {
                 .withDelayBetweenTries(10, ChronoUnit.SECONDS)
                 .withFixedBackoff()
                 .build();
-        try {
-            final CallResults<Object> results = new CallExecutor(config).execute(wrapper);
-            return (T) results.getResult();
-        } catch (final RuntimeException e) {
-            context.reportFailure();
-            throw e;
-        }
+        final CallResults<Object> results = new CallExecutor(config).execute(wrapper);
+        return (T) results.getResult();
     }
 
     public static final class User {
@@ -56,7 +51,7 @@ public User(final String userName, final byte[] sshPrivateKeyBlob, final String
         }
     }
 
-    protected final void probeSSH(final Context context, final String host, final User user) {
+    protected final void probeSSH(final String host, final User user) {
         final Callable<Boolean> callable = () -> {
             final JSch jsch = new JSch();
             final Session session = jsch.getSession(user.userName, host);
@@ -66,10 +61,10 @@ protected final void probeSSH(final Context context, final String host, final Us
             session.disconnect();
             return true;
         };
-        Assert.assertTrue("successful SSH connection", this.retry(context, callable));
+        Assert.assertTrue("successful SSH connection", this.retry(callable));
     }
 
-    protected final void probeSSH(final Context context, final String host, final KeyPair key) {
+    protected final void probeSSH(final String host, final KeyPair key) {
         final Callable<Boolean> callable = () -> {
             final JSch jsch = new JSch();
             final Session session = jsch.getSession("ec2-user", host);
@@ -79,7 +74,7 @@ protected final void probeSSH(final Context context, final String host, final Ke
             session.disconnect();
             return true;
         };
-        Assert.assertTrue("successful SSH connection", this.retry(context, callable));
+        Assert.assertTrue("successful SSH connection", this.retry(callable));
     }
 
     protected final Session tunnelSSH(final String host, final KeyPair key, final Integer localPort, final String remoteHost, final Integer remotePort) throws JSchException {