fixing port clashes

neo4j · Sep 4, 2017 · fb84133 · fb84133
1 parent de91cd7
commit fb84133
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 12 deletions.
diff --git a/...ncy-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java b/...ncy-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java
@@ -317,6 +317,7 @@ private void prepareDbWithDeletedRelationshipPartOfTheChain()
     {
         GraphDatabaseAPI db = (GraphDatabaseAPI) new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( testDirectory.graphDbDir() )
                 .setConfig( GraphDatabaseSettings.record_format, getRecordFormatName() )
+                .setConfig( "dbms.backup.enabled", "false" )
                 .newGraphDatabase();
         try
         {
@@ -355,6 +356,7 @@ protected Map<String,String> settings( String... strings )
         Map<String, String> defaults = new HashMap<>();
         defaults.put( GraphDatabaseSettings.pagecache_memory.name(), "8m" );
         defaults.put( GraphDatabaseSettings.record_format.name(), getRecordFormatName() );
+        defaults.put( "dbms.backup.enabled", "false" );
         return stringMap( defaults, strings );
     }
 

diff --git a/...test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java b/...test/java/org/neo4j/consistency/checking/full/DetectAllRelationshipInconsistenciesIT.java
@@ -162,9 +162,9 @@ private Config getTuningConfiguration()
     private GraphDatabaseAPI getGraphDatabaseAPI()
     {
         TestGraphDatabaseFactory factory = new TestGraphDatabaseFactory();
-        GraphDatabaseBuilder builder = factory.newEmbeddedDatabaseBuilder( directory.absolutePath() );
-        GraphDatabaseService database = builder
+        GraphDatabaseService database = factory.newEmbeddedDatabaseBuilder( directory.absolutePath() )
                 .setConfig( GraphDatabaseSettings.record_format, getRecordFormatName() )
+                .setConfig( "dbms.backup.enabled", "false" )
                 .newGraphDatabase();
         return (GraphDatabaseAPI) database;
     }

diff --git a/...tency-check/src/test/java/org/neo4j/consistency/repair/RelationshipChainExplorerTest.java b/...tency-check/src/test/java/org/neo4j/consistency/repair/RelationshipChainExplorerTest.java
@@ -124,6 +124,7 @@ private StoreAccess createStoreWithOneHighDegreeNodeAndSeveralDegreeTwoNodes( in
         GraphDatabaseService database = new TestGraphDatabaseFactory()
                 .newEmbeddedDatabaseBuilder( storeDirectory )
                 .setConfig( GraphDatabaseSettings.record_format, getRecordFormatName() )
+                .setConfig( "dbms.backup.enabled", "false" )
                 .newGraphDatabase();
 
         try ( Transaction transaction = database.beginTx() )

diff --git a/community/neo4j/src/test/java/org/neo4j/locking/CommunityLockAcquisitionTimeoutIT.java b/community/neo4j/src/test/java/org/neo4j/locking/CommunityLockAcquisitionTimeoutIT.java
@@ -91,7 +91,9 @@ public static void setUp()
         CustomClockFacadeFactory facadeFactory = new CustomClockFacadeFactory();
         database = new CustomClockTestGraphDatabaseFactory( facadeFactory )
                 .newEmbeddedDatabaseBuilder( directory.graphDbDir() )
-                .setConfig( GraphDatabaseSettings.lock_acquisition_timeout, "2s" ).newGraphDatabase();
+                .setConfig( GraphDatabaseSettings.lock_acquisition_timeout, "2s" )
+                .setConfig( "dbms.backup.enabled", "false" )
+                .newGraphDatabase();
 
         createTestNode( marker );
     }

diff --git a/.../batchimport/ParallelBatchImporterIT.java → ...ort/HighLimitParallelBatchImporterIT.java b/.../batchimport/ParallelBatchImporterIT.java → ...ort/HighLimitParallelBatchImporterIT.java
@@ -22,16 +22,17 @@
 import org.neo4j.kernel.impl.store.format.RecordFormats;
 import org.neo4j.kernel.impl.store.format.highlimit.HighLimit;
 import org.neo4j.unsafe.impl.batchimport.ParallelBatchImporter;
+import org.neo4j.unsafe.impl.batchimport.ParallelBatchImporterTest;
 import org.neo4j.unsafe.impl.batchimport.cache.idmapping.IdGenerator;
 import org.neo4j.unsafe.impl.batchimport.cache.idmapping.IdMapper;
 
 /**
  * Test for {@link ParallelBatchImporter} in an enterprise environment so that enterprise store is used.
  */
-public class ParallelBatchImporterIT extends org.neo4j.unsafe.impl.batchimport.ParallelBatchImporterTest
+public class HighLimitParallelBatchImporterIT extends ParallelBatchImporterTest
 {
-    public ParallelBatchImporterIT( InputIdGenerator inputIdGenerator, IdMapper idMapper, IdGenerator idGenerator,
-                                    boolean multiPassIterators )
+    public HighLimitParallelBatchImporterIT( InputIdGenerator inputIdGenerator, IdMapper idMapper, IdGenerator idGenerator,
+                                             boolean multiPassIterators )
     {
         super( inputIdGenerator, idMapper, idGenerator, multiPassIterators );
     }

diff --git a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/CompositeConstraintIT.java b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/CompositeConstraintIT.java
@@ -26,13 +26,15 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import org.neo4j.backup.OnlineBackupSettings;
 import org.neo4j.consistency.ConsistencyCheckService;
 import org.neo4j.consistency.ConsistencyCheckTool;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.factory.EnterpriseGraphDatabaseFactory;
+import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.test.rule.TestDirectory;
 
@@ -51,7 +53,10 @@ public class CompositeConstraintIT
     public void compositeNodeKeyConstraintUpdate() throws Exception
     {
         File storeDir = testDirectory.graphDbDir();
-        GraphDatabaseService database = new EnterpriseGraphDatabaseFactory().newEmbeddedDatabase( storeDir );
+        GraphDatabaseService database = new EnterpriseGraphDatabaseFactory()
+                .newEmbeddedDatabaseBuilder( storeDir )
+                .setConfig( OnlineBackupSettings.online_backup_enabled, Settings.FALSE )
+                .newGraphDatabase();
 
         Label label = Label.label( "label" );
 

diff --git a/...enterprise/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceRecordFormatIT.java b/...enterprise/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceRecordFormatIT.java
@@ -33,6 +33,7 @@
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
+import org.neo4j.backup.OnlineBackupSettings;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
@@ -41,10 +42,12 @@
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
 import org.neo4j.kernel.configuration.Config;
+import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.impl.store.format.highlimit.HighLimit;
 import org.neo4j.kernel.impl.store.format.standard.Standard;
 import org.neo4j.kernel.internal.GraphDatabaseAPI;
 import org.neo4j.logging.FormattedLogProvider;
+import org.neo4j.test.rule.DatabaseRule;
 import org.neo4j.test.rule.EmbeddedDatabaseRule;
 import org.neo4j.test.rule.SuppressOutput;
 
@@ -53,7 +56,9 @@
 @RunWith( Parameterized.class )
 public class ConsistencyCheckServiceRecordFormatIT
 {
-    private final EmbeddedDatabaseRule db = new EmbeddedDatabaseRule().startLazily();
+    private final DatabaseRule db = new EmbeddedDatabaseRule()
+            .withSetting( OnlineBackupSettings.online_backup_enabled, Settings.FALSE )
+            .startLazily();
 
     @Rule
     public final RuleChain ruleChain = RuleChain.outerRule( SuppressOutput.suppressAll() ).around( db );

diff --git a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/index/StartOnExistingDbWithIndexIT.java b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/index/StartOnExistingDbWithIndexIT.java
@@ -24,9 +24,11 @@
 
 import java.util.concurrent.TimeUnit;
 
+import org.neo4j.backup.OnlineBackupSettings;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Transaction;
+import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.logging.AssertableLogProvider;
 import org.neo4j.logging.LogProvider;
 import org.neo4j.test.TestEnterpriseGraphDatabaseFactory;
@@ -67,7 +69,9 @@ private GraphDatabaseService getDatabase( LogProvider logProvider )
     {
         return new TestEnterpriseGraphDatabaseFactory()
                 .setInternalLogProvider( logProvider )
-                .newEmbeddedDatabase( testDirectory.graphDbDir() );
+                .newEmbeddedDatabaseBuilder( testDirectory.graphDbDir() )
+                .setConfig( OnlineBackupSettings.online_backup_enabled, Settings.FALSE )
+                .newGraphDatabase();
     }
 
     private void waitIndexes( GraphDatabaseService db )

diff --git a/...se/neo4j-enterprise/src/test/java/org/neo4j/kernel/builtinprocs/ProcedureResourcesIT.java b/...se/neo4j-enterprise/src/test/java/org/neo4j/kernel/builtinprocs/ProcedureResourcesIT.java
@@ -35,12 +35,14 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import org.neo4j.backup.OnlineBackupSettings;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.Result;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.kernel.api.proc.ProcedureSignature;
+import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.impl.proc.Procedures;
 import org.neo4j.test.rule.DatabaseRule;
 import org.neo4j.test.rule.EnterpriseDatabaseRule;
@@ -51,7 +53,8 @@
 public class ProcedureResourcesIT
 {
     @Rule
-    public DatabaseRule db = new EnterpriseDatabaseRule();
+    public DatabaseRule db = new EnterpriseDatabaseRule()
+            .withSetting( OnlineBackupSettings.online_backup_enabled, Settings.FALSE );
 
     private final String indexDefinition = ":Label(prop)";
     private final String legacyIndexName = "legacyIndex";

diff --git a/.../neo4j-enterprise/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertEnterpriseIT.java b/.../neo4j-enterprise/src/test/java/org/neo4j/unsafe/batchinsert/BatchInsertEnterpriseIT.java
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.neo4j.backup.OnlineBackupSettings;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
@@ -40,6 +41,7 @@
 import org.neo4j.graphdb.factory.EnterpriseGraphDatabaseFactory;
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.helpers.collection.Iterables;
+import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.impl.MyRelTypes;
 import org.neo4j.kernel.impl.store.format.highlimit.HighLimit;
 import org.neo4j.kernel.impl.store.format.standard.Standard;
@@ -100,7 +102,11 @@ public void shouldInsertDifferentTypesOfThings() throws Exception
         }
 
         // THEN
-        GraphDatabaseService db = new EnterpriseGraphDatabaseFactory().newEmbeddedDatabase( directory.directory() );
+        GraphDatabaseService db = new EnterpriseGraphDatabaseFactory()
+                .newEmbeddedDatabaseBuilder( directory.directory() )
+                .setConfig( OnlineBackupSettings.online_backup_enabled, Settings.FALSE )
+                .newGraphDatabase();
+
         try ( Transaction tx = db.beginTx() )
         {
             Node node1 = db.getNodeById( node1Id );
@@ -191,6 +197,7 @@ private GraphDatabaseService newDb( File storeDir, String recordFormat )
     {
         return new EnterpriseGraphDatabaseFactory().newEmbeddedDatabaseBuilder( storeDir )
                 .setConfig( GraphDatabaseSettings.record_format, recordFormat )
+                .setConfig( OnlineBackupSettings.online_backup_enabled, Settings.FALSE )
                 .newGraphDatabase();
     }
 

diff --git a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/upgrade/RecordFormatsMigrationIT.java b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/upgrade/RecordFormatsMigrationIT.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.function.Consumer;
 
+import org.neo4j.backup.OnlineBackupSettings;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
@@ -137,6 +138,7 @@ private GraphDatabaseService startDb( String recordFormatName )
         return new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( testDirectory.graphDbDir() )
                 .setConfig( GraphDatabaseSettings.allow_upgrade, Settings.TRUE )
                 .setConfig( GraphDatabaseSettings.record_format, recordFormatName )
+                .setConfig( OnlineBackupSettings.online_backup_enabled, Settings.FALSE )
                 .newGraphDatabase();
     }
 

diff --git a/...o4j-harness-enterprise/src/test/java/org/neo4j/harness/junit/EnterpriseNeo4jRuleTest.java b/...o4j-harness-enterprise/src/test/java/org/neo4j/harness/junit/EnterpriseNeo4jRuleTest.java
@@ -23,7 +23,9 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import org.neo4j.backup.OnlineBackupSettings;
 import org.neo4j.harness.extensionpackage.MyEnterpriseUnmanagedExtension;
+import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.configuration.ssl.LegacySslPolicyConfig;
 import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.test.server.HTTP;
@@ -39,7 +41,8 @@ public class EnterpriseNeo4jRuleTest
     public Neo4jRule neo4j = new EnterpriseNeo4jRule()
             .withConfig( LegacySslPolicyConfig.certificates_directory.name(),
                     getRelativePath( getSharedTestTemporaryFolder(), LegacySslPolicyConfig.certificates_directory ) )
-            .withExtension( "/test", MyEnterpriseUnmanagedExtension.class );
+            .withExtension( "/test", MyEnterpriseUnmanagedExtension.class )
+            .withConfig( OnlineBackupSettings.online_backup_enabled, Settings.FALSE );
 
     @Rule
     public SuppressOutput suppressOutput = SuppressOutput.suppressAll();