From 82cf7f21c6532c6d4daa586e77a914b7049ac13a Mon Sep 17 00:00:00 2001
From: AMedvedev <AMedvedev@gridgain.com>
Date: Sun, 13 May 2018 00:02:16 +0300
Subject: [PATCH] IGNITE-5965 fix Flaky failure of
 GridServiceProcessorMultiNodeConfigSelfTest.testDeployOnEachNodeUpdateTopology

---
 .../GridServiceProcessorAbstractSelfTest.java       |  4 ++--
 ...GridServiceProcessorMultiNodeConfigSelfTest.java | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
index 9affe85385b3c..6d3b0d4835423 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
@@ -795,7 +795,7 @@ protected boolean waitForDeployment(final String srvcName, final int expectedDep
             @Override public boolean applyx() {
                 return actualCount(srvcName, g.services().serviceDescriptors())  == expectedDeps;
             }
-        }, 1500);
+        }, 12_000);
     }
 
     /**
@@ -972,4 +972,4 @@ int get() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java
index bd47b533867d2..e43d02934ddc2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorMultiNodeConfigSelfTest.java
@@ -22,8 +22,10 @@
 import java.util.concurrent.CountDownLatch;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.util.lang.GridAbsPredicateX;
 import org.apache.ignite.services.ServiceConfiguration;
+import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
 import org.apache.ignite.testframework.GridTestUtils;
 
 /**
@@ -107,6 +109,15 @@ public class GridServiceProcessorMultiNodeConfigSelfTest extends GridServiceProc
         return cfgs.toArray(new ServiceConfiguration[cfgs.size()]);
     }
 
+    /** {@inheritDoc} */
+    @Override protected IgniteConfiguration getConfiguration(final String igniteInstanceName) throws Exception {
+        final IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
+
+        ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setIdleConnectionTimeout(10000);
+
+        return cfg;
+    }
+
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
         super.beforeTestsStarted();
@@ -324,4 +335,4 @@ private void checkDeployOnEachNodeButClientUpdateTopology(String name) throws Ex
 
         checkCount(name, g.services().serviceDescriptors(), nodeCount());
     }
-}
\ No newline at end of file
+}