From 0909811538d91b0fd6d88da08012f3026645d8f3 Mon Sep 17 00:00:00 2001
From: Jungtaek Lim <kabhwan@gmail.com>
Date: Sat, 15 Feb 2014 11:00:46 +0900
Subject: [PATCH] Let JedisSentinelPoolTest recognizes "aborted failover" and
 fail fast

* let unit test fail if -failover-abort-* message is produced while waiting to failover
** waiting more is meaningless, and there is nothing we can do
** we can request "sentinel failover" to failover again, but it may can fail again
---
 .../jedis/tests/JedisSentinelPoolTest.java      | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java b/src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
index 62fffe6..b153c27 100644
--- a/src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
+++ b/src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
@@ -14,6 +14,7 @@ import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPubSub;
 import redis.clients.jedis.JedisSentinelPool;
 import redis.clients.jedis.Transaction;
+import redis.clients.jedis.exceptions.JedisConnectionException;
 import redis.clients.jedis.exceptions.JedisDataException;
 
 public class JedisSentinelPoolTest extends JedisTestBase {
@@ -86,8 +87,6 @@ public class JedisSentinelPoolTest extends JedisTestBase {
 
 	    @Override
 	    public void onMessage(String channel, String message) {
-		// TODO Auto-generated method stub
-
 	    }
 
 	    @Override
@@ -96,33 +95,27 @@ public class JedisSentinelPoolTest extends JedisTestBase {
 		if (channel.equals("+switch-master")) {
 		    newmaster.set(message);
 		    punsubscribe();
+		} else if (channel.startsWith("-failover-abort")) {
+		    punsubscribe();
+		    fail("Unfortunately sentinel cannot failover... reason(channel) : " + 
+			    channel + " / message : " + message);
 		}
-		// TODO Auto-generated method stub
-
 	    }
 
 	    @Override
 	    public void onSubscribe(String channel, int subscribedChannels) {
-		// TODO Auto-generated method stub
-
 	    }
 
 	    @Override
 	    public void onUnsubscribe(String channel, int subscribedChannels) {
-		// TODO Auto-generated method stub
-
 	    }
 
 	    @Override
 	    public void onPUnsubscribe(String pattern, int subscribedChannels) {
-		// TODO Auto-generated method stub
-
 	    }
 
 	    @Override
 	    public void onPSubscribe(String pattern, int subscribedChannels) {
-		// TODO Auto-generated method stub
-
 	    }
 	}, "*");