Updated Branches: refs/heads/trunk aebe612db -> de0707432
fix unit test patch by Marcus Eriksson Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de070743 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de070743 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de070743 Branch: refs/heads/trunk Commit: de0707432d92bdcf9b846a1135f64e1777ab56d6 Parents: aebe612 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 22 11:26:49 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 22 11:26:49 2013 -0500 ---------------------------------------------------------------------- .../compaction/LeveledCompactionStrategyTest.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de070743/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java index 0373862..58308ce 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -183,7 +183,7 @@ public class LeveledCompactionStrategyTest extends SchemaLoader for(SSTableReader s : table.getColumnFamilyStore(cfname).getSSTables()) { - assertTrue(changedSSTables.contains(s) && s.getSSTableLevel() == 6); + assertTrue(!changedSSTables.contains(s) || s.getSSTableLevel() == 6); } int [] levels = strat.manifest.getAllLevelSize(); @@ -192,8 +192,6 @@ public class LeveledCompactionStrategyTest extends SchemaLoader { if (i == 6) assertEquals(table.getColumnFamilyStore(cfname).getSSTables().size(), levels[i]); - else - assertEquals(0, levels[i]); } }
