From 0f483ef2e23c28f474f8e00ba651ae8b51f35b61 Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Wed, 26 Feb 2020 16:53:37 +0300 Subject: [PATCH] tests fixed --- redisson/src/test/java/org/redisson/BaseTest.java | 6 ------ .../test/java/org/redisson/RedissonBucketTest.java | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/redisson/src/test/java/org/redisson/BaseTest.java b/redisson/src/test/java/org/redisson/BaseTest.java index 4e73334f1..b623f8562 100644 --- a/redisson/src/test/java/org/redisson/BaseTest.java +++ b/redisson/src/test/java/org/redisson/BaseTest.java @@ -22,12 +22,6 @@ public abstract class BaseTest { @Override public void run() { defaultRedisson.shutdown(); - try { - RedisRunner.shutDownDefaultRedisServerInstance(); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } } }); } diff --git a/redisson/src/test/java/org/redisson/RedissonBucketTest.java b/redisson/src/test/java/org/redisson/RedissonBucketTest.java index cee4f8798..0fc9ca9ea 100755 --- a/redisson/src/test/java/org/redisson/RedissonBucketTest.java +++ b/redisson/src/test/java/org/redisson/RedissonBucketTest.java @@ -23,7 +23,7 @@ public class RedissonBucketTest extends BaseTest { public void testDeletedListener() throws FailedToStartRedisException, IOException, InterruptedException { RedisProcess instance = new RedisRunner() .nosave() - .port(6379) + .randomPort() .randomDir() .notifyKeyspaceEvents( KEYSPACE_EVENTS_OPTIONS.E, @@ -31,7 +31,7 @@ public class RedissonBucketTest extends BaseTest { .run(); Config config = new Config(); - config.useSingleServer().setAddress("redis://127.0.0.1:6379"); + config.useSingleServer().setAddress(instance.getRedisServerAddressAndPort()); RedissonClient redisson = Redisson.create(config); RBucket al = redisson.getBucket("test"); @@ -55,7 +55,7 @@ public class RedissonBucketTest extends BaseTest { public void testSetListener() throws FailedToStartRedisException, IOException, InterruptedException { RedisProcess instance = new RedisRunner() .nosave() - .port(6379) + .randomPort() .randomDir() .notifyKeyspaceEvents( KEYSPACE_EVENTS_OPTIONS.E, @@ -63,7 +63,7 @@ public class RedissonBucketTest extends BaseTest { .run(); Config config = new Config(); - config.useSingleServer().setAddress("redis://127.0.0.1:6379"); + config.useSingleServer().setAddress(instance.getRedisServerAddressAndPort()); RedissonClient redisson = Redisson.create(config); RBucket al = redisson.getBucket("test"); @@ -87,7 +87,7 @@ public class RedissonBucketTest extends BaseTest { public void testExpiredListener() throws FailedToStartRedisException, IOException, InterruptedException { RedisProcess instance = new RedisRunner() .nosave() - .port(6379) + .randomPort() .randomDir() .notifyKeyspaceEvents( KEYSPACE_EVENTS_OPTIONS.E, @@ -95,7 +95,7 @@ public class RedissonBucketTest extends BaseTest { .run(); Config config = new Config(); - config.useSingleServer().setAddress("redis://127.0.0.1:6379"); + config.useSingleServer().setAddress(instance.getRedisServerAddressAndPort()); RedissonClient redisson = Redisson.create(config); RBucket al = redisson.getBucket("test");