Commit Graph

10 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
Jonathan Leibiusky
71eb4c5b4a replace custom pool implementation with apache's 2010-11-21 18:16:31 -03:00
Jonathan Leibiusky
99a50db3ea Disabled logging in JedisPool benchmark 2010-10-14 09:12:41 -03:00
Yaourt
4a1d9928b5 Update the way the Redis host(s) can be configured for the tests.
There is now a single property : redis-hosts.
This property must contain at least 2 host definitions of the form "host:port" (comma separated).
Sharding tests need 2 hosts ...

If this is not the case, the default value used is "localhost:6379,localhost:6380".
Tests that required one host are using the first definition.
2010-09-15 10:49:36 +02:00
Jonathan Leibiusky
224555afd2 Added password to Jedis, JedisPool and ShardedJedis constructor for easier and more efficient usage 2010-09-14 16:43:48 -03:00
Jonathan Leibiusky
708ae8a56e Fixed small bug in the benchmark test 2010-09-14 14:17:10 -03:00
Alex Tkachman
20dac7e9b4 more reasonable PoolBenchmark 2010-09-14 11:59:25 +02:00
Jonathan Leibiusky
8207c2415f Added a benchmark to the jedis pool 2010-09-08 17:39:25 -03:00