Repository: ignite Updated Branches: refs/heads/ignite-7708 470573df1 -> d08d0073d
IGNITE-7708 Debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b121a9f2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b121a9f2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b121a9f2 Branch: refs/heads/ignite-7708 Commit: b121a9f20b494f93863cf1ce0b6777b70a94bfde Parents: 470573d Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Tue Apr 17 18:03:29 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Apr 17 18:03:29 2018 +0300 ---------------------------------------------------------------------- .../ignite/testframework/junits/GridAbstractTest.java | 10 ++++++++++ .../junits/IgniteConfigVariationsAbstractTest.java | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b121a9f2/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 2e2cc98..2bd4ba1 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -2403,6 +2403,9 @@ public abstract class GridAbstractTest extends TestCase { private boolean reset; /** */ + private Exception clsInitFailEx; + + /** */ private IgniteTestResources rsrcs; /** @@ -2471,6 +2474,13 @@ public abstract class GridAbstractTest extends TestCase { } /** + * @param clsInitFailEx Class initialization failed exception. + */ + public void setClassInitializationFailedException(Exception clsInitFailEx) { + this.clsInitFailEx = clsInitFailEx; + } + + /** * @param stopped Stopped flag. */ public void setStopped(int stopped) { http://git-wip-us.apache.org/repos/asf/ignite/blob/b121a9f2/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java index c4862bb..a907c0e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteConfigVariationsAbstractTest.java @@ -82,15 +82,15 @@ public abstract class IgniteConfigVariationsAbstractTest extends GridCommonAbstr @Override protected void beforeTestsStarted() throws Exception { assert testsCfg != null; - FileUtils.deleteDirectory(workDir); - - info("Ignite's 'work' directory has been cleaned."); - if (Ignition.allGrids().size() != testsCfg.gridCount()) { info("All nodes will be stopped, new " + testsCfg.gridCount() + " nodes will be started."); Ignition.stopAll(true); + FileUtils.deleteDirectory(workDir); + + info("Ignite's 'work' directory has been cleaned."); + startGrids(testsCfg.gridCount()); for (int i = 0; i < testsCfg.gridCount(); i++)
