ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: #ignite-237: Fix GridCacheSwapSelfTest.
Date Wed, 25 Feb 2015 12:47:30 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-237 b39df2456 -> 07cc9212c


#ignite-237: Fix GridCacheSwapSelfTest.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07cc9212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07cc9212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07cc9212

Branch: refs/heads/ignite-237
Commit: 07cc9212cbb1222292c40b7506d81da8c2e7fae6
Parents: b39df24
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed Feb 25 15:47:24 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed Feb 25 15:47:24 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheSwapSelfTest.java         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07cc9212/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
index d78c3a1..a4f16c4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
@@ -66,6 +66,9 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
     /** */
     private boolean swapEnabled = true;
 
+    /** PeerClassLoading excluded. */
+    private boolean excluded;
+
     /** {@inheritDoc} */
     @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception
{
         IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -87,8 +90,10 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
         cfg.setCacheConfiguration(cacheCfg);
 
         cfg.setDeploymentMode(SHARED);
-        cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheSwapSelfTest.class.getName(),
-            CacheValue.class.getName());
+
+        if (excluded)
+            cfg.setPeerClassLoadingLocalClassPathExclude(GridCacheSwapSelfTest.class.getName(),
+                CacheValue.class.getName());
 
         cfg.setMarshaller(new OptimizedMarshaller(false));
 
@@ -147,6 +152,9 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest {
     public void testSwapDeployment() throws Exception {
         try {
             Ignite ignite1 = startGrid(1);
+
+            excluded = true;
+
             Ignite ignite2 = startGrid(2);
 
             GridCache<Integer, Object> cache1 = ((IgniteKernal)ignite1).cache(null);


Mime
View raw message