From da28d25a9f7a3b7cc4004f59abf566add7995174 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Wed, 21 Sep 2016 12:54:26 +0300
Subject: [PATCH] test fixed

---
 .../executor/RedissonExecutorServiceTest.java | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java b/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
index beab257f5..0aa86d6db 100644
--- a/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
+++ b/redisson/src/test/java/org/redisson/executor/RedissonExecutorServiceTest.java
@@ -35,8 +35,8 @@ public class RedissonExecutorServiceTest extends BaseTest {
     
     @BeforeClass
     public static void beforeClass() throws IOException, InterruptedException {
+        BaseTest.beforeClass();
         if (!RedissonRuntimeEnvironment.isTravis) {
-            BaseTest.beforeClass();
             Config config = createConfig();
             RedissonNodeConfig nodeConfig = new RedissonNodeConfig(config);
             nodeConfig.setExecutorServiceWorkers(Collections.singletonMap("test", 1));
@@ -48,25 +48,29 @@ public class RedissonExecutorServiceTest extends BaseTest {
     @AfterClass
     public static void afterClass() throws IOException, InterruptedException {
         BaseTest.afterClass();
-        node.shutdown();
+        if (!RedissonRuntimeEnvironment.isTravis) {
+            node.shutdown();
+        }
     }
 
     @Before
     @Override
     public void before() throws IOException, InterruptedException {
         super.before();
-        Config config = createConfig();
-        RedissonNodeConfig nodeConfig = new RedissonNodeConfig(config);
-        nodeConfig.setExecutorServiceWorkers(Collections.singletonMap("test", 1));
-        node = RedissonNode.create(nodeConfig);
-        node.start();
+        if (RedissonRuntimeEnvironment.isTravis) {
+            Config config = createConfig();
+            RedissonNodeConfig nodeConfig = new RedissonNodeConfig(config);
+            nodeConfig.setExecutorServiceWorkers(Collections.singletonMap("test", 1));
+            node = RedissonNode.create(nodeConfig);
+            node.start();
+        }
     }
 
     @After
     @Override
     public void after() throws InterruptedException {
+        super.after();
         if (RedissonRuntimeEnvironment.isTravis) {
-            super.after();
             node.shutdown();
         }
     }