GEODE-8244: enable ignored redis tests (apache#5245)

shjgiser · Jun 15, 2020 · dd6a002 · dd6a002
1 parent 4477013
commit dd6a002
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/geode-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java b/geode-redis/src/distributedTest/java/org/apache/geode/redis/RedisDistDUnitTest.java
@@ -25,7 +25,6 @@
 
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import redis.clients.jedis.Jedis;
@@ -100,7 +99,6 @@ public void run() {
   }
 
   @Test
-  @Ignore("GEODE-8127")
   public void testConcurrentSaddOperations_runWithoutException_orDataLoss()
       throws InterruptedException {
     List<String> set1 = new ArrayList<>();

diff --git a/geode-redis/src/distributedTest/java/org/apache/geode/redis/executors/ExpireDUnitTest.java b/geode-redis/src/distributedTest/java/org/apache/geode/redis/executors/ExpireDUnitTest.java
@@ -24,7 +24,6 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Test;
 import redis.clients.jedis.Jedis;
 
@@ -160,14 +159,13 @@ public void whenExpirationIsSet_andKeyIsDeletedOnAnotherServerThenReset_ttlIsRem
 
 
   @Test
-  @Ignore("GEODE-8058: this test needs to pass to have feature parity with native redis")
   public void whenExpirationIsSet_andKeyWithoutExpirationIsRenamedOnAnotherServer_expirationIsCorrectlyTransferred() {
     String key1 = "key1";
     String key2 = "key2";
 
     jedis1.sadd(key1, "value");
     jedis1.sadd(key2, "value");
-    jedis1.expire(key1, 20);
+    jedis1.expire(key1, 200);
     jedis2.rename(key1, key2);
 
     assertThat(jedis1.ttl(key2)).isGreaterThan(0L);

diff --git a/geode-redis/src/integrationTest/java/org/apache/geode/redis/StringsIntegrationTest.java b/geode-redis/src/integrationTest/java/org/apache/geode/redis/StringsIntegrationTest.java
@@ -291,7 +291,7 @@ public void testSET_should_not_clearPreviousTTL_onFailure() {
   }
 
   @Test
-  @Ignore("GEODE-8058: this test needs to pass to have feature parity with native redis")
+  @Ignore("KEEPTTL is part of redis 6")
   public void testSET_with_KEEPTTL_shouldRetainPreviousTTL_OnSuccess() {
     String key = "key";
     String value = "value";
@@ -719,7 +719,7 @@ public void testMGet_requestNonexistentKey_respondsWithNil() {
 
   @Test
   @Ignore("GEODE-8192")
-  public void testMGet_concurrentInstances_mustBeAtomic()
+  public void testMSet_concurrentInstances_mustBeAtomic()
       throws InterruptedException, ExecutionException {
     String keyBaseName = "MSETBASE";
     String val1BaseName = "FIRSTVALBASE";