Merge remote-tracking branch 'origin/feature/travis-ci' into feature/travis-ci

.travis.yml

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 sudo: false
+dist: trusty
 
 language: java
 jdk:
@@ -36,4 +37,4 @@ before_script:
     - $REDIS_BIN/redis-cli PING
     - export REDIS_VERSION="$(redis-cli INFO SERVER | sed -n 2p)"
     - echo $REDIS_VERSION
-script: mvn -DargLine="-DredisBinary=$REDIS_BIN/redis-server" -Punit-test -Ptravis clean verify
+script: mvn -DargLine="-DredisBinary=$REDIS_BIN/redis-server -DtravisEnv=true" -Punit-test -Ptravis clean verify

src/test/java/org/redisson/RedissonTest.java

@@ -12,6 +12,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Test;
 import org.redisson.RedisRunner.RedisProcess;
 import org.redisson.client.RedisConnectionException;
@@ -262,6 +263,7 @@ public class RedissonTest {
 
     @Test
     public void testManyConnections() {
+        Assume.assumeFalse(Boolean.valueOf(System.getProperty("travisEnv")));
         Config redisConfig = new Config();
         redisConfig.useSingleServer()
         .setConnectionMinimumIdleSize(10000)