Add open options settings for test configs

neo4j · Dec 1, 2021 · 885682d · 885682d
1 parent 34cd62c
commit 885682d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/src/test/java/com/neo4j/docker/neo4jserver/TestMounting.java b/src/test/java/com/neo4j/docker/neo4jserver/TestMounting.java
@@ -22,7 +22,9 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.time.Duration;
 import java.util.Random;
 import java.util.function.Consumer;
@@ -240,6 +242,9 @@ void testCantWriteIfSecureEnabledAndNoPermissions_logs() throws IOException
 	void canMountAllTheThings_fileMounts(boolean asCurrentUser) throws Exception
 	{
 		Path testOutputFolder = HostFileSystemOperations.createTempFolder( "mount-everything-" );
+		Path confFile = Paths.get( "src", "test", "resources", "confs", "MountConf.conf" );
+		Files.copy( confFile, testOutputFolder.resolve( "neo4j.conf" ) );
+
 		try(GenericContainer container = setupBasicContainer( asCurrentUser, false ))
 		{
 			HostFileSystemOperations.createTempFolderAndMountAsVolume( container, "conf", "/conf", testOutputFolder );
@@ -268,7 +273,7 @@ void canMountAllTheThings_namedVolumes(boolean asCurrentUser) throws Exception
 		{
 			container.withCreateContainerCmdModifier(
 					(Consumer<CreateContainerCmd>) cmd -> cmd.getHostConfig().withBinds(
-							Bind.parse("conf-"+id+":/conf"),
+							// Bind.parse("conf-"+id+":/conf"),        // todo we need a set of open options, ask
 							Bind.parse("data-"+id+":/data"),
 							Bind.parse("import-"+id+":/import"),
 							Bind.parse("logs-"+id+":/logs"),

diff --git a/src/test/resources/confs/EnterpriseOnlyNotOverwritten.conf b/src/test/resources/confs/EnterpriseOnlyNotOverwritten.conf
@@ -1 +1,5 @@
-causal_clustering.transaction_advertised_address=localhost:6060
+causal_clustering.transaction_advertised_address=localhost:6060
+
+dbms.jvm.additional=--add-opens=java.base/java.nio=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/java.io=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
diff --git a/src/test/resources/confs/EnvVarsOverride.conf b/src/test/resources/confs/EnvVarsOverride.conf
@@ -1 +1,5 @@
-dbms.memory.pagecache.size=1000m
+dbms.memory.pagecache.size=1000m
+
+dbms.jvm.additional=--add-opens=java.base/java.nio=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/java.io=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
diff --git a/src/test/resources/confs/ExtendedConf.conf b/src/test/resources/confs/ExtendedConf.conf
@@ -1 +1,4 @@
-dbms.logs.http.rotation.keep_number=$(expr 2 * 10)
+dbms.logs.http.rotation.keep_number=$(expr 2 * 10)
+dbms.jvm.additional=--add-opens=java.base/java.nio=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/java.io=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
diff --git a/src/test/resources/confs/MountConf.conf b/src/test/resources/confs/MountConf.conf
@@ -0,0 +1,5 @@
+dbms.memory.heap.max_size=512m
+
+dbms.jvm.additional=--add-opens=java.base/java.nio=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/java.io=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
diff --git a/src/test/resources/confs/ReadConf.conf b/src/test/resources/confs/ReadConf.conf
@@ -1 +1,3 @@
-dbms.memory.heap.max_size=512m
+dbms.jvm.additional=--add-opens=java.base/java.nio=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/java.io=ALL-UNNAMED
+dbms.jvm.additional=--add-opens=java.base/sun.nio.ch=ALL-UNNAMED