Skip to content

Commit 6cb6586

Browse files
author
Andrew Jefferson
committed
handle the difference between community and enterprise mountable directories in TestUpgrade
1 parent ea936c4 commit 6cb6586

File tree

1 file changed

+21
-3
lines changed

1 file changed

+21
-3
lines changed

src/test/java/com/neo4j/docker/TestUpgrade.java

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import org.testcontainers.containers.output.Slf4jLogConsumer;
1818
import org.testcontainers.containers.wait.strategy.Wait;
1919
import org.testcontainers.images.PullPolicy;
20-
import org.testcontainers.shaded.com.google.common.collect.ImmutableList;
2120

2221
import java.io.File;
2322
import java.io.FileWriter;
@@ -27,6 +26,8 @@
2726
import java.nio.file.Path;
2827
import java.time.Duration;
2928
import java.time.Instant;
29+
import java.util.Arrays;
30+
import java.util.Collections;
3031
import java.util.HashMap;
3132
import java.util.List;
3233
import java.util.Map;
@@ -40,8 +41,9 @@
4041
public class TestUpgrade
4142
{
4243
private static final Logger log = LoggerFactory.getLogger( TestUpgrade.class );
43-
ImmutableList<String> readonlyMounts = ImmutableList.of( "conf" );
44-
ImmutableList<String> writableMounts = ImmutableList.of( "data", "logs", "metrics" );
44+
private static final List<String> readonlyMounts = Collections.singletonList( "conf" );
45+
private static final List<String> writableMounts = getWriteableMounts();
46+
4547
private final String user = "neo4j";
4648
private final String password = "quality";
4749

@@ -104,6 +106,7 @@ void canUpgradeFromBeforeFilePermissionFix35() throws Exception
104106
}
105107
}
106108

109+
// TODO: parameterize these tests for different configurations (e.g. running as non-root user)
107110
@Test
108111
void canUpgradeFromSameMinorVersion() throws Exception
109112
{
@@ -297,4 +300,19 @@ private static String releaseImageName( int major, int minor )
297300
return String.format( "neo4j:%d.%d%s", major, minor,
298301
(TestSettings.EDITION == TestSettings.Edition.ENTERPRISE) ? "-enterprise" : "" );
299302
}
303+
304+
private static List<String> getWriteableMounts()
305+
{
306+
switch ( TestSettings.EDITION )
307+
{
308+
case COMMUNITY:
309+
return Arrays.asList( "data", "logs" );
310+
case ENTERPRISE:
311+
// /metrics doesn't get chowned in 3.x so doesn't always work
312+
return TestSettings.NEO4J_VERSION.major < 4 ? Arrays.asList( "data", "logs" ) : Arrays.asList( "data", "logs", "metrics" );
313+
default:
314+
Assertions.fail( "Unknown Edition: " + TestSettings.EDITION );
315+
return Collections.emptyList();
316+
}
317+
}
300318
}

0 commit comments

Comments
 (0)