Commit Graph

8 Commits

Author SHA1 Message Date
Jonathan Leibiusky
18652b906b Merge branch 'speed-up-unit-test' of github.com:HeartSaVioR/jedis into upgrade_libs
Conflicts:
	src/test/java/redis/clients/jedis/tests/JedisPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelPoolTest.java
	src/test/java/redis/clients/jedis/tests/JedisSentinelTest.java
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
	src/test/java/redis/clients/jedis/tests/ShardedJedisPoolTest.java
	src/test/java/redis/clients/jedis/tests/benchmark/PoolBenchmark.java
	src/test/java/redis/clients/jedis/tests/commands/TransactionCommandsTest.java
2013-11-29 12:12:30 -05:00
Jonathan Leibiusky
bbb867781d upgrade to commons-pool 2 2013-11-28 08:13:57 -05:00
Jungtaek Lim
7e1a1a70b2 Speed up Sentinel related tests
* remove FIXME sleep codes for Sentinel related tests
** add functions for Sentinel tests (JedisSentinelTestUtil)
*** waitForSentinelRecognizeRedisReplication
*** waitForNewPromotedMaster
*** waitForSentinelsRecognizeEachOthers
**** TODO: there're no command for sentinel to list recognized sentinel
**** sleep 5.5 sec (sentinel pings to master every 5 sec)

* set HostAndPort class to public(no longer inner) class
** reason: We cannot know pool's current master if HostAndPort class is
private inner class / HostAndPort classes are duplicated (main/test)
** make getter method and parameterized constructor
*** set fields once, get anytime
2013-10-07 11:03:32 +09:00
Ben Smith
909be715bc adding del to sharded jedis pipeline 2012-10-21 17:17:26 +01:00
Jonathan Leibiusky
79965d5d0a Merge remote branch 'raszi/findbugs'
Conflicts:
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
2011-12-13 19:16:14 -03:00
Jonathan Leibiusky
cb1b19b5d4 Merge branch 'master' of https://github.com/ivowiblo/jedis
Conflicts:
	src/test/java/redis/clients/jedis/tests/ShardedJedisPipelineTest.java
2011-12-13 18:08:17 -03:00
Yaourt
f82fb50897 Update ShardedJedisPipelineTest class name. 2011-09-16 22:40:39 +02:00
Yaourt
dcba7bd3b3 Rename test : Shar<>edJedisPipelineTest to ShardedJedisPipelineTest 2011-09-16 17:23:59 +02:00