Fork integration tests in enterprise-kernel, harness, enterprise-server.

Start servers on random ports to allow forked tests executions. Move ha test to integration tests module.
neo4j · Jul 7, 2017 · 10ee188 · 10ee188
1 parent 7038b68
commit 10ee188
Show file tree

Hide file tree

Showing 19 changed files with 63 additions and 81 deletions.
diff --git a/community/neo4j-harness/pom.xml b/community/neo4j-harness/pom.xml
@@ -54,17 +54,6 @@
     </license>
   </licenses>
 
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <forkCount>1</forkCount>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
   <dependencies>
 
     <dependency>

diff --git a/...eo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java b/...eo4j-harness/src/main/java/org/neo4j/harness/internal/AbstractInProcessServerBuilder.java
@@ -97,16 +97,16 @@ private void init( File workingDir )
         withConfig( http1.type, "HTTP" );
         withConfig( http1.encryption, Encryption.NONE.name() );
         withConfig( http1.enabled, "true" );
-        withConfig( http1.address, "localhost:" + Integer.toString( freePort( 1001, 3000 ) ) );
+        withConfig( http1.address, "localhost:0" );
 
         withConfig( http2.type, "HTTP" );
         withConfig( http2.encryption, Encryption.TLS.name() );
         withConfig( http2.enabled, "false" );
-        withConfig( http2.address, "localhost:" + Integer.toString( freePort( 3001, 5000 ) ) );
+        withConfig( http2.address, "localhost:0" );
 
         withConfig( bolt0.type, "BOLT" );
         withConfig( bolt0.enabled, "true" );
-        withConfig( bolt0.address, "localhost:" + Integer.toString( freePort( 5001, 9000 ) ) );
+        withConfig( bolt0.address, "localhost:0" );
     }
 
     @Override
@@ -250,18 +250,6 @@ private String randomFolderName()
         return DigestUtils.md5Hex( Long.toString( ThreadLocalRandom.current().nextLong() ) );
     }
 
-    private int freePort( int startRange, int endRange )
-    {
-        try
-        {
-            return Ports.findFreePort( Ports.INADDR_LOCALHOST, new int[]{startRange, endRange} ).getPort();
-        }
-        catch ( IOException e )
-        {
-            throw new RuntimeException( "Unable to find an available port: " + e.getMessage(), e );
-        }
-    }
-
     private static String toStringForThirdPartyPackageProperty( List<ThirdPartyJaxRsPackage> extensions )
     {
         String propertyString = "";

diff --git a/...unity/neo4j-harness/src/main/java/org/neo4j/harness/internal/InProcessServerControls.java b/...unity/neo4j-harness/src/main/java/org/neo4j/harness/internal/InProcessServerControls.java
@@ -28,17 +28,18 @@
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.config.Configuration;
 import org.neo4j.harness.ServerControls;
-import org.neo4j.helpers.AdvertisedSocketAddress;
 import org.neo4j.helpers.Exceptions;
+import org.neo4j.helpers.HostnamePort;
 import org.neo4j.io.fs.FileUtils;
-import org.neo4j.kernel.configuration.BoltConnector;
+import org.neo4j.kernel.configuration.ConnectorPortRegister;
 import org.neo4j.server.AbstractNeoServer;
 
 public class InProcessServerControls implements ServerControls
 {
     private final File serverFolder;
     private final AbstractNeoServer server;
     private final Closeable additionalClosable;
+    private ConnectorPortRegister connectorPortRegister;
 
     public InProcessServerControls( File serverFolder, AbstractNeoServer server, Closeable additionalClosable )
     {
@@ -50,8 +51,8 @@ public InProcessServerControls( File serverFolder, AbstractNeoServer server, Clo
     @Override
     public URI boltURI()
     {
-        AdvertisedSocketAddress address = server.getConfig().get( new BoltConnector( "bolt" ).advertised_address );
+        HostnamePort boltHostNamePort = connectorPortRegister.getLocalAddress( "bolt" );
-        return URI.create( "bolt://" + address.getHostname() + ":" + address.getPort() );
+        return URI.create( "bolt://" + boltHostNamePort.getHost() + ":" + boltHostNamePort.getPort() );
     }
 
     @Override
@@ -69,12 +70,14 @@ public Optional<URI> httpsURI()
     public void start()
     {
         this.server.start();
+        this.connectorPortRegister = server.getDependencyResolver().resolveDependency( ConnectorPortRegister.class );
     }
 
     @Override
     public void close()
     {
         server.stop();
+        this.connectorPortRegister = null;
         try
         {
             additionalClosable.close();

diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTestIT.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTestIT.java
@@ -83,8 +83,7 @@ public class InProcessBuilderTestIT
     public void shouldLaunchAServerInSpecifiedDirectory() throws Exception
     {
         // Given
-        File workDir = new File( testDir.directory(), "specific" );
+        File workDir = testDir.directory( "specific" );
-        workDir.mkdir();
 
         // When
         try ( ServerControls server = getTestServerBuilder( workDir ).newServer() )

diff --git a/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java b/community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java
@@ -61,7 +61,7 @@
 
 public class CommunityServerBuilder
 {
-    private static final ListenSocketAddress ANY_ADDRESS = new ListenSocketAddress( "localhost", 0 );
+    protected static final ListenSocketAddress ANY_ADDRESS = new ListenSocketAddress( "localhost", 0 );
 
     protected final LogProvider logProvider;
     private ListenSocketAddress address = new ListenSocketAddress( "localhost", 7474 );

diff --git a/enterprise/kernel/pom.xml b/enterprise/kernel/pom.xml
@@ -47,12 +47,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <forkCount>1</forkCount>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>

diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml
@@ -285,13 +285,6 @@
           <useManifestOnlyJar>false</useManifestOnlyJar>
         </configuration>
       </plugin>
-
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <forkCount>1</forkCount>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 

diff --git a/...nterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterpriseIT.java b/...nterprise/src/test/java/org/neo4j/server/enterprise/NeoServerRestartTestEnterpriseIT.java
@@ -31,7 +31,7 @@ public class NeoServerRestartTestEnterpriseIT extends NeoServerRestartTestIT
 {
     protected NeoServer getNeoServer( String customPageSwapperName ) throws IOException
     {
-        CommunityServerBuilder builder = EnterpriseServerBuilder.server()
+        CommunityServerBuilder builder = EnterpriseServerBuilder.serverOnRandomPorts()
                 .withProperty( GraphDatabaseSettings.pagecache_swapper.name(), customPageSwapperName );
         return builder.build();
     }

diff --git a/...r-enterprise/src/test/java/org/neo4j/server/enterprise/functional/EnterpriseServerIT.java b/...r-enterprise/src/test/java/org/neo4j/server/enterprise/functional/EnterpriseServerIT.java
@@ -53,7 +53,7 @@ public class EnterpriseServerIT
     public void shouldBeAbleToStartInHAMode() throws Throwable
     {
         // Given
-        NeoServer server = EnterpriseServerBuilder.server()
+        NeoServer server = EnterpriseServerBuilder.serverOnRandomPorts()
                 .usingDataDir( folder.getRoot().getAbsolutePath() )
                 .withProperty( mode.name(), "HA" )
                 .withProperty( server_id.name(), "1" )
@@ -69,7 +69,7 @@ public void shouldBeAbleToStartInHAMode() throws Throwable
             assertThat( server.getDatabase().getGraph(), is( instanceOf(HighlyAvailableGraphDatabase.class) ) );
 
             Client client = Client.create();
-            ClientResponse r = client.resource( "http://localhost:7474/db/manage/server/ha" )
+            ClientResponse r = client.resource( getHaEndpoint( server ) )
                     .accept( APPLICATION_JSON ).get( ClientResponse.class );
             assertEquals( 200, r.getStatus() );
             assertThat( r.getEntity( String.class ), containsString( "master" ) );
@@ -84,7 +84,7 @@ public void shouldBeAbleToStartInHAMode() throws Throwable
     public void shouldRequireAuthorizationForHAStatusEndpoints() throws Exception
     {
         // Given
-        NeoServer server = EnterpriseServerBuilder.server()
+        NeoServer server = EnterpriseServerBuilder.serverOnRandomPorts()
                 .withProperty( GraphDatabaseSettings.auth_enabled.name(), "true" )
                 .usingDataDir( folder.getRoot().getAbsolutePath() )
                 .withProperty( mode.name(), "HA" )
@@ -101,7 +101,7 @@ public void shouldRequireAuthorizationForHAStatusEndpoints() throws Exception
             assertThat( server.getDatabase().getGraph(), is( instanceOf(HighlyAvailableGraphDatabase.class) ) );
 
             Client client = Client.create();
-            ClientResponse r = client.resource( "http://localhost:7474/db/manage/server/ha" )
+            ClientResponse r = client.resource( getHaEndpoint( server ) )
                     .accept( APPLICATION_JSON ).get( ClientResponse.class );
             assertEquals( 401, r.getStatus() );
         }
@@ -115,7 +115,7 @@ public void shouldRequireAuthorizationForHAStatusEndpoints() throws Exception
     public void shouldAllowDisablingAuthorizationOnHAStatusEndpoints() throws Exception
     {
         // Given
-        NeoServer server = EnterpriseServerBuilder.server()
+        NeoServer server = EnterpriseServerBuilder.serverOnRandomPorts()
                 .withProperty( GraphDatabaseSettings.auth_enabled.name(), "true" )
                 .withProperty( HaSettings.ha_status_auth_enabled.name(), "false" )
                 .usingDataDir( folder.getRoot().getAbsolutePath() )
@@ -133,7 +133,7 @@ public void shouldAllowDisablingAuthorizationOnHAStatusEndpoints() throws Except
             assertThat( server.getDatabase().getGraph(), is( instanceOf(HighlyAvailableGraphDatabase.class) ) );
 
             Client client = Client.create();
-            ClientResponse r = client.resource( "http://localhost:7474/db/manage/server/ha" )
+            ClientResponse r = client.resource( getHaEndpoint( server ) )
                     .accept( APPLICATION_JSON ).get( ClientResponse.class );
             assertEquals( 200, r.getStatus() );
             assertThat( r.getEntity( String.class ), containsString( "master" ) );
@@ -144,6 +144,11 @@ public void shouldAllowDisablingAuthorizationOnHAStatusEndpoints() throws Except
         }
     }
 
+    private String getHaEndpoint( NeoServer server )
+    {
+        return server.baseUri().toString() + "db/manage/server/ha";
+    }
+
     @After
     public void whoListensOn5001()
     {

diff --git a/...rver-enterprise/src/test/java/org/neo4j/server/enterprise/functional/ServerMetricsIT.java b/...rver-enterprise/src/test/java/org/neo4j/server/enterprise/functional/ServerMetricsIT.java
@@ -19,27 +19,25 @@
  */
 package org.neo4j.server.enterprise.functional;
 
-import java.io.File;
-import java.io.IOException;
-
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientResponse;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import java.io.File;
+import java.io.IOException;
+
 import org.neo4j.metrics.MetricsSettings;
 import org.neo4j.metrics.source.server.ServerMetrics;
 import org.neo4j.server.NeoServer;
 import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder;
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
-
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-
 import static org.neo4j.metrics.MetricsTestHelper.metricsCsv;
 import static org.neo4j.metrics.MetricsTestHelper.readLongValue;
 
@@ -54,7 +52,7 @@ public void shouldShowServerMetrics() throws Throwable
         // Given
         String path = folder.getRoot().getAbsolutePath();
         File metricsPath = new File( path + "/metrics" );
-        NeoServer server = EnterpriseServerBuilder.server()
+        NeoServer server = EnterpriseServerBuilder.serverOnRandomPorts()
                 .usingDataDir( path )
                 .withProperty( MetricsSettings.metricsEnabled.name(), "true" )
                 .withProperty( MetricsSettings.csvEnabled.name(), "true" )
@@ -67,7 +65,7 @@ public void shouldShowServerMetrics() throws Throwable
             // when
             server.start();
 
-            String host = "http://localhost:7474" +
+            String host = "http://localhost:" + server.baseUri().getPort() +
                           ServerSettings.rest_api_path.getDefaultValue() + "/transaction/commit";
 
             for ( int i = 0; i < 5; i++ )

diff --git a/...enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java b/...enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.util.Optional;
 
+import org.neo4j.kernel.configuration.BoltConnector;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
 import org.neo4j.logging.LogProvider;
@@ -44,6 +45,14 @@ public static EnterpriseServerBuilder server()
         return server( NullLogProvider.getInstance() );
     }
 
+    public static EnterpriseServerBuilder serverOnRandomPorts()
+    {
+        EnterpriseServerBuilder server = server();
+        server.onRandomPorts();
+        server.withProperty( new BoltConnector( "bolt" ).listen_address.name(), "localhost:0" );
+        return server;
+    }
+
     public static EnterpriseServerBuilder server( LogProvider logProvider )
     {
         return new EnterpriseServerBuilder( logProvider );

diff --git a/...e/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementIT.java b/...e/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementIT.java
@@ -62,7 +62,7 @@ public void shouldBeAbleToRestartServer() throws Exception
         Config config = ConfigLoader.loadConfig(
                 Optional.of( baseDir.directory() ),
                 EnterpriseServerBuilder
-                        .server()
+                        .serverOnRandomPorts()
                         .withDefaultDatabaseTuning()
                         .usingDataDir( dataDirectory1 )
                         .createConfigFiles(),

diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionIT.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/rest/EnterpriseVersionIT.java
@@ -47,7 +47,7 @@ public abstract class EnterpriseVersionIT extends ExclusiveServerTestBase
     public static void setupServer() throws Exception
     {
         FakeClock clock = Clocks.fakeClock();
-        server = EnterpriseServerBuilder.server()
+        server = EnterpriseServerBuilder.serverOnRandomPorts()
                 .usingDataDir( staticFolder.getRoot().getAbsolutePath() )
                 .withClock(clock)
                 .build();

diff --git a/...server-enterprise/src/test/java/org/neo4j/server/rest/PropertyExistenceConstraintsIT.java b/...server-enterprise/src/test/java/org/neo4j/server/rest/PropertyExistenceConstraintsIT.java
@@ -36,7 +36,6 @@
 import org.neo4j.graphdb.schema.ConstraintDefinition;
 import org.neo4j.graphdb.schema.ConstraintType;
 import org.neo4j.kernel.impl.annotations.Documented;
-import org.neo4j.logging.NullLogProvider;
 import org.neo4j.server.NeoServer;
 import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder;
 import org.neo4j.server.helpers.CommunityServerBuilder;
@@ -80,7 +79,7 @@ public static void initServer() throws Exception
     {
         suppressAll().call( (Callable<Void>) () ->
         {
-            CommunityServerBuilder serverBuilder = EnterpriseServerBuilder.server( NullLogProvider.getInstance() );
+            CommunityServerBuilder serverBuilder = EnterpriseServerBuilder.serverOnRandomPorts();
 
             PropertyExistenceConstraintsIT.server = ServerHelper.createNonPersistentServer( serverBuilder );
             return null;

diff --git a/...rver-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java b/...rver-enterprise/src/test/java/org/neo4j/server/rest/security/AbstractRESTInteraction.java
@@ -42,6 +42,7 @@
 import org.neo4j.kernel.api.KernelTransaction;
 import org.neo4j.kernel.api.security.SecurityContext;
 import org.neo4j.kernel.configuration.BoltConnector;
+import org.neo4j.kernel.configuration.ConnectorPortRegister;
 import org.neo4j.kernel.configuration.ssl.LegacySslPolicyConfig;
 import org.neo4j.kernel.enterprise.api.security.EnterpriseAuthManager;
 import org.neo4j.kernel.impl.coreapi.InternalTransaction;
@@ -65,6 +66,9 @@
 
 abstract class AbstractRESTInteraction extends CommunityServerTestBase implements NeoInteractionLevel<RESTSubject>
 {
+
+    private ConnectorPortRegister connectorPortRegister;
+
     abstract String commitPath();
 
     abstract void consume( Consumer<ResourceIterator<Map<String,Object>>> resultConsumer, JsonNode data );
@@ -79,7 +83,7 @@ abstract class AbstractRESTInteraction extends CommunityServerTestBase implement
 
     AbstractRESTInteraction( Map<String,String> config ) throws IOException
     {
-        CommunityServerBuilder builder = EnterpriseServerBuilder.server();
+        CommunityServerBuilder builder = EnterpriseServerBuilder.serverOnRandomPorts();
         builder = builder
                 .withProperty( new BoltConnector( "bolt" ).type.name(), "BOLT" )
                 .withProperty( new BoltConnector( "bolt" ).enabled.name(), "true" )
@@ -97,6 +101,7 @@ abstract class AbstractRESTInteraction extends CommunityServerTestBase implement
         this.server = builder.build();
         this.server.start();
         authManager = this.server.getDependencyResolver().resolveDependency( EnterpriseAuthManager.class );
+        connectorPortRegister = server.getDependencyResolver().resolveDependency( ConnectorPortRegister.class );
     }
 
     @Override
@@ -223,7 +228,7 @@ public String getConnectionProtocol()
     @Override
     public HostnamePort lookupConnector( String connectorKey )
     {
-        return new HostnamePort( "localhost", 7687 );
+        return connectorPortRegister.getLocalAddress( connectorKey );
     }
 
     private String parseErrorMessage( HTTP.Response response )