Updated Branches: refs/heads/trunk f5e3ae67c -> 880188384
Stabilize TableTest Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88018838 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88018838 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88018838 Branch: refs/heads/trunk Commit: 880188384f83ef673d5f02099be91e8da07a57b2 Parents: f5e3ae6 Author: Yuki Morishita <yu...@apache.org> Authored: Fri Nov 9 16:29:43 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Nov 9 16:29:43 2012 -0600 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/TableTest.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88018838/test/unit/org/apache/cassandra/db/TableTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/TableTest.java b/test/unit/org/apache/cassandra/db/TableTest.java index 4244e1c..20ab173 100644 --- a/test/unit/org/apache/cassandra/db/TableTest.java +++ b/test/unit/org/apache/cassandra/db/TableTest.java @@ -336,12 +336,11 @@ public class TableTest extends SchemaLoader RowMutation rm = new RowMutation("Keyspace1", ROW.key); ColumnFamily cf = ColumnFamily.create("Keyspace1", "Standard1"); cf.addColumn(column("col1", "val1", 1L)); - cf.addColumn(expiringColumn("col2", "val2", 1L, 1)); + cf.addColumn(expiringColumn("col2", "val2", 1L, 60)); // long enough not to be tombstoned cf.addColumn(column("col3", "val3", 1L)); rm.add(cf); rm.apply(); - cfStore.forceBlockingFlush(); Runnable verify = new WrappedRunnable() {