Polishing

- Make pubsub test more stable (PUBLISH happened before the client was reconnected)
- Decrease logging

src/test/java/com/lambdaworks/redis/PubSubCommandTest.java

@@ -2,6 +2,8 @@
 
 package com.lambdaworks.redis;
 
+import static com.google.code.tempusfugit.temporal.Duration.*;
+import static com.google.code.tempusfugit.temporal.Timeout.*;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertThat;
@@ -13,6 +15,10 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+import com.google.code.tempusfugit.temporal.Condition;
+import com.google.code.tempusfugit.temporal.Duration;
+import com.google.code.tempusfugit.temporal.Timeout;
+import com.google.code.tempusfugit.temporal.WaitFor;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.MoreExecutors;
 import org.junit.After;
@@ -256,6 +262,13 @@ public void resubscribeChannelsOnReconnect() throws Exception {
         assertThat(channels.take()).isEqualTo(channel);
         assertThat((long) counts.take()).isEqualTo(1);
 
+        WaitFor.waitOrTimeout(new Condition() {
+            @Override
+            public boolean isSatisfied() {
+                return pubsub.isOpen();
+            }
+        }, timeout(seconds(5)));
+
         redis.publish(channel, message);
         assertThat(channels.take()).isEqualTo(channel);
         assertThat(messages.take()).isEqualTo(message);
@@ -272,6 +285,13 @@ public void resubscribePatternsOnReconnect() throws Exception {
         assertThat(patterns.take()).isEqualTo(pattern);
         assertThat((long) counts.take()).isEqualTo(1);
 
+        WaitFor.waitOrTimeout(new Condition() {
+            @Override
+            public boolean isSatisfied() {
+                return pubsub.isOpen();
+            }
+        }, timeout(seconds(5)));
+
         redis.publish(channel, message);
         assertThat(channels.take()).isEqualTo(channel);
         assertThat(messages.take()).isEqualTo(message);

src/test/resources/log4j.properties

@@ -4,7 +4,7 @@ log4j.rootLogger=INFO, stdout, file
 # Direct log messages to stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.Target=System.out
-log4j.appender.stdout.threshold=DEBUG
+log4j.appender.stdout.threshold=INFO
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%t] (%c{1}:%L) %m%n
 
@@ -16,6 +16,7 @@ log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%-5p] [%t]
 
 log4j.logger.com.lambdaworks=INFO
 log4j.logger.io.netty=INFO
+log4j.logger.com.lambdaworks.redis.protocol=DEBUG
 log4j.logger.com.lambdaworks.redis.cluster=INFO
 log4j.logger.com.lambdaworks.redis.protocol.ConnectionWatchdog=INFO