This is an automated email from the ASF dual-hosted git repository.
sabbey37 pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new c78dddd GEODE-8549: Remove use of junit EnvironmentVariables rule
from geode-redis (#5568)
c78dddd is described below
commit c78dddd28f5dd18861668a83327b54bac8c7050b
Author: Jens Deppe <[email protected]>
AuthorDate: Wed Sep 30 07:19:04 2020 -0700
GEODE-8549: Remove use of junit EnvironmentVariables rule from geode-redis
(#5568)
Authored-by: Jens Deppe <[email protected]>
---
.../executor/connection/AuthNativeRedisAcceptanceTest.java | 8 --------
.../src/commonTest/java/org/apache/geode/NativeRedisTestRule.java | 7 +------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git
a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/AuthNativeRedisAcceptanceTest.java
b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/AuthNativeRedisAcceptanceTest.java
index 14328c8..fedbd51 100644
---
a/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/AuthNativeRedisAcceptanceTest.java
+++
b/geode-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/executor/connection/AuthNativeRedisAcceptanceTest.java
@@ -15,12 +15,10 @@
package org.apache.geode.redis.internal.executor.connection;
-
import org.junit.After;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
import org.junit.rules.TestRule;
import org.testcontainers.containers.GenericContainer;
import redis.clients.jedis.Jedis;
@@ -34,12 +32,6 @@ public class AuthNativeRedisAcceptanceTest extends
AuthIntegrationTest {
@ClassRule
public static TestRule ignoreOnWindowsRule = new IgnoreOnWindowsRule();
- // The ryuk container is responsible for cleanup at JVM exit. Since this
class already closes the
- // containers it starts, we do not need the ryuk container.
- @ClassRule
- public static EnvironmentVariables environmentVariables =
- new EnvironmentVariables().set("TESTCONTAINERS_RYUK_DISABLED", "true");
-
private GenericContainer<?> redisContainer;
@After
diff --git
a/geode-redis/src/commonTest/java/org/apache/geode/NativeRedisTestRule.java
b/geode-redis/src/commonTest/java/org/apache/geode/NativeRedisTestRule.java
index ae58e61..1cb47ed 100644
--- a/geode-redis/src/commonTest/java/org/apache/geode/NativeRedisTestRule.java
+++ b/geode-redis/src/commonTest/java/org/apache/geode/NativeRedisTestRule.java
@@ -17,7 +17,6 @@ package org.apache.geode;
import java.io.Serializable;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
import org.junit.rules.ExternalResource;
import org.junit.rules.RuleChain;
import org.junit.runner.Description;
@@ -36,11 +35,7 @@ public class NativeRedisTestRule extends ExternalResource
implements Serializabl
delegate = RuleChain
// Docker compose does not work on windows in CI. Ignore this test on
windows
// Using a RuleChain to make sure we ignore the test before the rule
comes into play
- .outerRule(new IgnoreOnWindowsRule())
- // The ryuk container is responsible for cleanup at JVM exit.
- // Since this rule already closes the
- // container it has started, we do not need the ryuk container.
- .around(new EnvironmentVariables().set("TESTCONTAINERS_RYUK_DISABLED",
"true"));
+ .outerRule(new IgnoreOnWindowsRule());
}
public int getPort() {
