You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/01/15 16:49:18 UTC
[1/2] git commit: Fix tests post-#5121
Fix tests post-#5121
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dcddfaf5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dcddfaf5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dcddfaf5
Branch: refs/heads/trunk
Commit: dcddfaf5e16479b735235bb4a29ce8742cea56ba
Parents: ec35427
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 15 16:48:53 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 15 16:48:53 2013 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/db/SystemTableTest.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/dcddfaf5/test/unit/org/apache/cassandra/db/SystemTableTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/SystemTableTest.java b/test/unit/org/apache/cassandra/db/SystemTableTest.java
index 7c7eb24..12d2e34 100644
--- a/test/unit/org/apache/cassandra/db/SystemTableTest.java
+++ b/test/unit/org/apache/cassandra/db/SystemTableTest.java
@@ -25,6 +25,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Collection;
import java.util.List;
import java.util.UUID;
@@ -33,6 +34,7 @@ import org.junit.Test;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.FBUtilities;
public class SystemTableTest
{
@@ -40,7 +42,9 @@ public class SystemTableTest
public void testLocalTokens()
{
// Remove all existing tokens
- SystemTable.updateTokens(Collections.<Token> emptySet());
+ Collection<Token> current = SystemTable.loadTokens().asMap().get(FBUtilities.getLocalAddress());
+ if (current != null && !current.isEmpty())
+ SystemTable.updateTokens(current);
List<Token> tokens = new ArrayList<Token>()
{{