Test connection fix

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/jobs/ConnectJob.java

@@ -71,15 +71,15 @@ public class ConnectJob extends AbstractJob
             }
 
             try {
-                container.connect(monitor, initialize, reflect);
+                final boolean connected = container.connect(monitor, initialize, reflect);
+
+                connectStatus = connected ? Status.OK_STATUS : Status.CANCEL_STATUS;
             } finally {
                 if (connectThread != null) {
                     connectThread.setName(oldName);
                     connectThread = null;
                 }
             }
-
-            connectStatus = Status.OK_STATUS;
         }
         catch (Throwable ex) {
             log.debug(ex);

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/ConnectionWizard.java

@@ -136,6 +136,9 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
                         if (op.getConnectError() != null) {
                             throw new InvocationTargetException(op.getConnectError());
                         }
+                        if (op.getConnectStatus() == Status.CANCEL_STATUS) {
+                            throw new InterruptedException();
+                        }
                     }
                 });
 
@@ -221,6 +224,9 @@ public abstract class ConnectionWizard extends Wizard implements INewWizard {
                 if (connectError != null || monitor.isCanceled()) {
                     return Status.OK_STATUS;
                 }
+                if (connectStatus == Status.CANCEL_STATUS) {
+                    return Status.CANCEL_STATUS;
+                }
 
                 monitor.worked(1);
                 DBPDataSource dataSource = container.getDataSource();