Added check for system properties in addition to env variables

Julien Ruaux · Julien Ruaux · commit a5734f67d749 · 2022-03-22T17:42:19.000-07:00
diff --git a/subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisServer.java b/subprojects/testcontainers-redis/src/main/java/com/redis/testcontainers/RedisServer.java
@@ -26,7 +26,8 @@ static String toString(RedisServer server) {
 	}
 
 	static boolean isEnabled(String suffix) {
-		String value = System.getenv("TESTCONTAINERS_" + suffix);
+		String name = "TESTCONTAINERS_" + suffix;
+		String value = System.getProperty(name, System.getenv(name));
 		// Containers are enabled by default
 		if (StringUtils.isEmpty(value)) {
 			return true;

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ static String toString(RedisServer server) {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`static boolean isEnabled(String suffix) {`
`29`		`- String value = System.getenv("TESTCONTAINERS_" + suffix);`
	`29`	`+ String name = "TESTCONTAINERS_" + suffix;`
	`30`	`+ String value = System.getProperty(name, System.getenv(name));`
`30`	`31`	`// Containers are enabled by default`
`31`	`32`	`if (StringUtils.isEmpty(value)) {`
`32`	`33`	`return true;`