You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/30 13:29:54 UTC
[1/3] incubator-ignite git commit: # ignite fixed tests methods
calculation
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-32 6c7da2cde -> 582e8a591
# ignite fixed tests methods calculation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/310f8e87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/310f8e87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/310f8e87
Branch: refs/heads/ignite-32
Commit: 310f8e872f7355e80785c8ee622f0feeecfc12c1
Parents: 6fd75f9
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 12:22:36 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 12:22:36 2014 +0300
----------------------------------------------------------------------
.../org/gridgain/testframework/junits/GridAbstractTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/310f8e87/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
index 922acc4..5900c12 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridAbstractTest.java
@@ -88,7 +88,7 @@ public abstract class GridAbstractTest extends TestCase {
static {
System.setProperty(IgniteSystemProperties.GG_ATOMIC_CACHE_DELETE_HISTORY_SIZE, "10000");
-
+
Thread timer = new Thread(new GridTestClockTimer(), "gridgain-clock-for-tests");
timer.setDaemon(true);
@@ -1402,7 +1402,8 @@ public abstract class GridAbstractTest extends TestCase {
int cnt = 0;
for (Method m : GridAbstractTest.this.getClass().getMethods())
- if (m.getDeclaringClass().getName().startsWith("org.gridgain")) {
+ if (m.getDeclaringClass().getName().startsWith("org.gridgain") ||
+ m.getDeclaringClass().getName().startsWith("org.apache.ignite")) {
if (m.getName().startsWith("test") && Modifier.isPublic(m.getModifiers()))
cnt++;
}
[3/3] incubator-ignite git commit: Merge branches 'ignite-32' and
'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-32
Posted by sb...@apache.org.
Merge branches 'ignite-32' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/582e8a59
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/582e8a59
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/582e8a59
Branch: refs/heads/ignite-32
Commit: 582e8a5919976863a4c3f7ba4c7b2cb3187e0fed
Parents: 6c7da2c 5fd0d7c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Dec 30 19:29:22 2014 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Dec 30 19:29:22 2014 +0700
----------------------------------------------------------------------
.../org/gridgain/testframework/junits/GridAbstractTest.java | 5 +++--
.../gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-ignite git commit: # ignite commented hanging test
Posted by sb...@apache.org.
# ignite commented hanging test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5fd0d7c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fd0d7c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fd0d7c9
Branch: refs/heads/ignite-32
Commit: 5fd0d7c9ad979e46b46465f836508ad201a48ef3
Parents: 310f8e8
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 15:25:12 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 15:25:12 2014 +0300
----------------------------------------------------------------------
.../gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd0d7c9/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
index 2775623..daf2b5a 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
@@ -36,7 +36,8 @@ public class GridCacheFailoverTestSuite extends TestSuite {
// Failure consistency tests.
suite.addTestSuite(GridCacheDhtAtomicRemoveFailureTest.class);
suite.addTestSuite(GridCacheDhtRemoveFailureTest.class);
- suite.addTestSuite(GridCacheNearRemoveFailureTest.class);
+ // TODO: IGNITE-80.
+ // suite.addTestSuite(GridCacheNearRemoveFailureTest.class);
// suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class); TODO GG-9150
suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.class);