Verify connectivity to get the right error message for neo4j protocol

Author: sherfert

cypher-shell/src/integration-test/java/org/neo4j/shell/MainIntegrationTest.java

@@ -88,7 +88,7 @@ public void wrongPortWithBolt() throws Exception
         main.connectMaybeInteractively( shell, connectionConfig, true );
     }
 
-    @Ignore
+    @Test
     public void wrongPortWithNeo4j() throws Exception
     {
         // given
@@ -103,7 +103,7 @@ public void wrongPortWithNeo4j() throws Exception
         ConnectionConfig connectionConfig = sac.connectionConfig;
 
         exception.expect( ServiceUnavailableException.class );
-        exception.expectMessage( "Unable to connect to localhost:1234, ensure the database is running and that there is a working network connection to it" );
+        exception.expectMessage( "Unable to connect to database, ensure the database is running and that there is a working network connection to it" );
         main.connectMaybeInteractively( shell, connectionConfig, true );
     }
 

cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java

@@ -172,6 +172,9 @@ private void reconnect() {
     }
 
     private void reconnect(boolean keepBookmark) {
+        // This will already throw an exception if there is no connectivity
+        driver.verifyConnectivity();
+
         SessionConfig.Builder builder = SessionConfig.builder();
         builder.withDefaultAccessMode( AccessMode.WRITE );
         if ( !ABSENT_DB_NAME.equals( activeDatabaseNameAsSetByUser ) )