You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/03/04 18:24:46 UTC
cassandra git commit: fix test merge
Repository: cassandra
Updated Branches:
refs/heads/trunk 7376f42fc -> 8501e5186
fix test merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8501e518
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8501e518
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8501e518
Branch: refs/heads/trunk
Commit: 8501e51868727acea74e195bfe777b5e96da39d7
Parents: 7376f42
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Mar 4 17:24:27 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Mar 4 17:24:27 2015 +0000
----------------------------------------------------------------------
.../unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8501e518/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
index 77c6df9..0fdf940 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java
@@ -219,6 +219,7 @@ public class SSTableRewriterTest extends SchemaLoader
for (int i = 0; i < 1000; i++)
writer.append(StorageService.getPartitioner().decorateKey(random(i, 10)), cf);
SSTableReader s = writer.openEarly(1000);
+ assert s != null;
assertFileCounts(dir.list(), 2, 2);
for (int i = 1000; i < 2000; i++)
writer.append(StorageService.getPartitioner().decorateKey(random(i, 10)), cf);
@@ -817,7 +818,7 @@ public class SSTableRewriterTest extends SchemaLoader
{
if (f.endsWith("-CRC.db"))
continue;
- if (f.contains("-tmplink-"))
+ if (f.contains("tmplink-"))
tmplinkcount++;
else if (f.contains("tmp-"))
tmpcount++;