From 98c7cf6d7e6bd05329a4133c068c50e668947291 Mon Sep 17 00:00:00 2001 From: Jennifer Hickey Date: Sun, 30 Jun 2013 12:40:35 -0700 Subject: [PATCH] Upgrade to Lettuce 2.3.3 DATAREDIS-204 --- gradle.properties | 2 +- .../connection/lettuce/LettuceConnectionIntegrationTests.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 07ebe9537..9924a085b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,5 +8,5 @@ log4jVersion=1.2.17 version=1.0.5.BUILD-SNAPSHOT srpVersion=0.6 jacksonVersion=1.8.8 -lettuceVersion=2.3.2 +lettuceVersion=2.3.3 mockitoVersion=1.8.5 diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java index 601f8210c..0bb5501ee 100644 --- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java +++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceConnectionIntegrationTests.java @@ -21,12 +21,12 @@ import static org.junit.Assert.fail; import java.util.List; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.data.redis.RedisSystemException; import org.springframework.data.redis.connection.AbstractConnectionIntegrationTests; import org.springframework.data.redis.connection.DefaultStringRedisConnection; +import org.springframework.test.annotation.IfProfileValue; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -42,6 +42,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegrationTests { @Test + @IfProfileValue(name = "runLongTests", value = "true") public void testMultiThreadsOneBlocking() throws Exception { Thread th = new Thread(new Runnable() { public void run() { @@ -81,7 +82,6 @@ public class LettuceConnectionIntegrationTests extends AbstractConnectionIntegra assertEquals("delay", conn2.get("txs1")); } - @Ignore("DATAREDIS-189 Lettuce exec without multi times out waiting for a reply instead of throwing Exception") @Test public void testCloseInTransaction() { connection.multi();