From 5010a676de17f3314e6c99fbc9577185a1af9ac1 Mon Sep 17 00:00:00 2001
From: Lasse Westh-Nielsen <lassewesth@gmail.com>
Date: Fri, 28 Jul 2017 14:38:46 +0200
Subject: [PATCH] fixing port conflicts for Enterprise Server integration
 tests, tends to be a problem on POWER8 agents

---
 enterprise/server-enterprise/pom.xml                      | 8 ++++++++
 .../enterprise/helpers/EnterpriseServerBuilder.java       | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml
index 24fa4713530c1..a2bc65c184bb9 100644
--- a/enterprise/server-enterprise/pom.xml
+++ b/enterprise/server-enterprise/pom.xml
@@ -208,6 +208,14 @@
       <version>${project.version}</version>
       <scope>runtime</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-com</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java
index 32cba3e32c741..6e2112595f1d2 100644
--- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java
+++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java
@@ -23,6 +23,8 @@
 import java.io.IOException;
 import java.util.Optional;
 
+import org.neo4j.backup.OnlineBackupSettings;
+import org.neo4j.com.ports.allocation.PortAuthority;
 import org.neo4j.kernel.configuration.BoltConnector;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory;
@@ -33,6 +35,8 @@
 import org.neo4j.server.helpers.CommunityServerBuilder;
 import org.neo4j.server.rest.web.DatabaseActions;
 
+import static org.neo4j.helpers.ListenSocketAddress.listenAddress;
+
 public class EnterpriseServerBuilder extends CommunityServerBuilder
 {
     protected EnterpriseServerBuilder( LogProvider logProvider )
@@ -50,6 +54,8 @@ public static EnterpriseServerBuilder serverOnRandomPorts()
         EnterpriseServerBuilder server = server();
         server.onRandomPorts();
         server.withProperty( new BoltConnector( "bolt" ).listen_address.name(), "localhost:0" );
+        server.withProperty( OnlineBackupSettings.online_backup_server.name(),
+                listenAddress( "127.0.0.1", PortAuthority.allocatePort() ) );
         return server;
     }