4.0 add retries for cluster overview test (#748) (#749)

Add in a retry mechanism to account for leader elections in cluster for cluster tests

Author: gjmwoods

driver/src/test/java/org/neo4j/driver/util/cc/Cluster.java

@@ -236,26 +236,47 @@ private void startNoWait( ClusterMember member )
     private Set<ClusterMember> membersWithRole( ClusterMemberRole role )
     {
         Set<ClusterMember> membersWithRole = new HashSet<>();
+        int retryCount = 0;
 
-        Driver driver = driverToAnyCore( members, clusterDrivers );
-        final ClusterMemberRoleDiscovery discovery = clusterDrivers.getDiscovery();
-        final Map<BoltServerAddress,ClusterMemberRole> clusterOverview = discovery.findClusterOverview( driver );
-        for ( BoltServerAddress boltAddress : clusterOverview.keySet() )
+        while ( membersWithRole.isEmpty() && retryCount < 10 )
         {
-            if ( role == clusterOverview.get( boltAddress ) )
+            Driver driver = driverToAnyCore( members, clusterDrivers );
+            final ClusterMemberRoleDiscovery discovery = clusterDrivers.getDiscovery();
+            final Map<BoltServerAddress,ClusterMemberRole> clusterOverview = discovery.findClusterOverview( driver );
+            for ( BoltServerAddress boltAddress : clusterOverview.keySet() )
             {
-                ClusterMember member = findByBoltAddress( boltAddress, members );
-                if ( member == null )
+                if ( role == clusterOverview.get( boltAddress ) )
+                {
+                    ClusterMember member = findByBoltAddress( boltAddress, members );
+                    if ( member == null )
+                    {
+                        throw new IllegalStateException( "Unknown cluster member: '" + boltAddress + "'\n" + this );
+                    }
+                    membersWithRole.add( member );
+                }
+            }
+            retryCount++;
+
+            if ( !membersWithRole.isEmpty() )
+            {
+                break;
+            }
+            else
+            {
+                try
+                {
+                    // give some time for cluster to stabilise
+                    Thread.sleep( 2000 );
+                }
+                catch ( InterruptedException ignored )
                 {
-                    throw new IllegalStateException( "Unknown cluster member: '" + boltAddress + "'\n" + this );
                 }
-                membersWithRole.add( member );
             }
         }
 
         if ( membersWithRole.isEmpty() )
         {
-            throw new IllegalStateException( "No cluster members with role '" + role + "' found.\n" + this );
+            throw new IllegalStateException( "No cluster members with role '" + role + " " + this );
         }
 
         return membersWithRole;