You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/31 22:42:13 UTC
[1/2] git commit: Ninja: remove buggy test assertion from 2.1
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 8e4415b69 -> 85bcd2d74
Ninja: remove buggy test assertion from 2.1
This was fixed by CASSANDRA-7390, but that fix starts with Cassandra
3.0.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1879d992
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1879d992
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1879d992
Branch: refs/heads/cassandra-2.1.0
Commit: 1879d9928b506845f45578580f2a902d41409c8d
Parents: 563a04b
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 31 15:41:06 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 31 15:41:06 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/MoveTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1879d992/test/unit/org/apache/cassandra/service/MoveTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/service/MoveTest.java b/test/unit/org/apache/cassandra/service/MoveTest.java
index 6ecd500..834411b 100644
--- a/test/unit/org/apache/cassandra/service/MoveTest.java
+++ b/test/unit/org/apache/cassandra/service/MoveTest.java
@@ -138,7 +138,8 @@ public class MoveTest
numMoved++;
}
}
- assertEquals("mismatched number of moved token", numMoved, 1);
+ // This assertion isn't reliable in 2.0 and 2.1. See CASSANDRA-7390
+ // assertEquals("mismatched number of moved token", numMoved, 1);
}
// moving endpoint back to the normal state
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
test/unit/org/apache/cassandra/service/MoveTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85bcd2d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85bcd2d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85bcd2d7
Branch: refs/heads/cassandra-2.1.0
Commit: 85bcd2d744ceb3f0d0cef8de6c165c5c2f53b602
Parents: 8e4415b 1879d99
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 31 15:42:02 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 31 15:42:02 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/service/MoveTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/85bcd2d7/test/unit/org/apache/cassandra/service/MoveTest.java
----------------------------------------------------------------------