tests fixed

redisson/pom.xml

@@ -439,8 +439,6 @@
                             <exclude>SpringNamespaceTest</exclude>
                             <exclude>SpringNamespaceWikiTest</exclude>
                             <exclude>SpringNamespaceObjectTest</exclude>
-                            <exclude>RedissonBatchTest</exclude>
-                            <exclude>RedissonBatchRxTest</exclude>
                             <exclude>RedissonFairLockTest</exclude>
                             <exclude>RedissonStreamTest</exclude>
                             <exclude>RedissonLockHeavyTest</exclude>
@@ -458,6 +456,7 @@
                             <exclude>RedissonMapCacheReactiveTest</exclude>
 
     <!--
+
                             <exclude>RedissonMapReactiveTest</exclude>
                             <exclude>RedissonGeoTest</exclude>
                             <exclude>RedissonScoredSortedSetTest</exclude>

redisson/src/test/java/org/redisson/ClusterRunner.java

@@ -64,11 +64,20 @@ public class ClusterRunner {
             }
             processes.put(nodes.get(runner), runner.clusterConfigFile(confFile).run());
         }
-        Thread.sleep(1000);
+
-        for (RedisRunner.RedisProcess process : processes.valueSet()) {
+        boolean allAlive = true;
-            if (!process.isAlive()) {
+        for (int i = 0; i < 15; i++) {
-                throw new RedisRunner.FailedToStartRedisException();
+            for (RedisRunner.RedisProcess process : processes.valueSet()) {
+                allAlive &= process.isAlive();
+            }
+            if (allAlive) {
+                break;
             }
+            allAlive = true;
+            Thread.sleep(100);
+        }
+        if (!allAlive) {
+            throw new RedisRunner.FailedToStartRedisException();
         }
         return new ClusterProcesses(processes);
     }

redisson/src/test/java/org/redisson/rx/RedissonBatchRxTest.java

@@ -110,7 +110,7 @@ public class RedissonBatchRxTest extends BaseRxTest {
         assertThat(sync(b2f2)).isEqualTo(2d);
     }
     
-    @Test(timeout = 15000)
+    @Test(timeout = 20000)
     public void testPerformance() {
         RMapRx<String, String> map = redisson.getMap("map");
         Map<String, String> m = new HashMap<String, String>();