You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/04/17 15:24:44 UTC
[1/2] ignite git commit: IGNITE-7708 Debug
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 <al...@gmail.com>
Authored: Tue Apr 17 18:03:29 2018 +0300
Committer: Alexey Goncharuk <al...@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++)
[2/2] ignite git commit: IGNITE-7708 Debug
Posted by ag...@apache.org.
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/d08d0073
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d08d0073
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d08d0073
Branch: refs/heads/ignite-7708
Commit: d08d0073dfb12d3793f70e020e9be2a3c88e8c66
Parents: b121a9f
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Apr 17 18:24:36 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Apr 17 18:24:36 2018 +0300
----------------------------------------------------------------------
.../testframework/junits/GridAbstractTest.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d08d0073/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 2bd4ba1..1b72306 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
@@ -612,7 +612,7 @@ public abstract class GridAbstractTest extends TestCase {
catch (Exception | Error t) {
t.printStackTrace();
- getTestCounters().setStopped(getTestCounters().getNumberOfTests() - 1);
+ getTestCounters().setClassInitializationFailedException(t);
try {
tearDown();
@@ -629,6 +629,8 @@ public abstract class GridAbstractTest extends TestCase {
info(">>> Starting test: " + testDescription() + " <<<");
try {
+ getTestCounters().checkClassInitialized();
+
beforeTest();
}
catch (Exception | Error t) {
@@ -1687,7 +1689,9 @@ public abstract class GridAbstractTest extends TestCase {
finally {
serializedObj.clear();
- if (isLastTest()) {
+ boolean lastTest = isLastTest();
+
+ if (lastTest) {
info(">>> Stopping test class: " + testClassDescription() + " <<<");
TestCounters counters = getTestCounters();
@@ -1725,7 +1729,7 @@ public abstract class GridAbstractTest extends TestCase {
cleanReferences();
- if (isLastTest() && isSafeTopology() && stopGridErr)
+ if (lastTest && isSafeTopology() && stopGridErr)
throw new RuntimeException("Not all Ignite instances has been stopped. Please, see log for details.");
}
}
@@ -2403,7 +2407,7 @@ public abstract class GridAbstractTest extends TestCase {
private boolean reset;
/** */
- private Exception clsInitFailEx;
+ private Throwable clsInitFailEx;
/** */
private IgniteTestResources rsrcs;
@@ -2476,11 +2480,19 @@ public abstract class GridAbstractTest extends TestCase {
/**
* @param clsInitFailEx Class initialization failed exception.
*/
- public void setClassInitializationFailedException(Exception clsInitFailEx) {
+ public void setClassInitializationFailedException(Throwable clsInitFailEx) {
this.clsInitFailEx = clsInitFailEx;
}
/**
+ * @throws IgniteCheckedException If test class initialization failed.
+ */
+ public void checkClassInitialized() throws IgniteCheckedException {
+ if (clsInitFailEx != null)
+ throw new IgniteCheckedException("Test class initialization failed", clsInitFailEx);
+ }
+
+ /**
* @param stopped Stopped flag.
*/
public void setStopped(int stopped) {