import 14.2.4 nautilus point release

[ceph.git] / ceph / src / rocksdb / utilities / cassandra / cassandra_format_test.cc

diff --git a/ceph/src/rocksdb/utilities/cassandra/cassandra_format_test.cc b/ceph/src/rocksdb/utilities/cassandra/cassandra_format_test.cc
index e0fe28b3a36d74eb6891037dbd924c9b54ba3e3e..8f9baa723574b69c8acf2eeb0da8b3ce7d7fc5a5 100644 (file)
--- a/ceph/src/rocksdb/utilities/cassandra/cassandra_format_test.cc
+++ b/ceph/src/rocksdb/utilities/cassandra/cassandra_format_test.cc
@@ -125,13 +125,14 @@ TEST(ExpiringColumnTest, ExpiringColumn) {
 TEST(TombstoneTest, TombstoneCollectable) {
   int32_t now = (int32_t)time(nullptr);
   int32_t gc_grace_seconds = 16440;
+  int32_t time_delta_seconds = 10;
   EXPECT_TRUE(Tombstone(ColumnTypeMask::DELETION_MASK, 0,
-                        now - gc_grace_seconds,
-                        ToMicroSeconds(now - gc_grace_seconds))
+                        now - gc_grace_seconds - time_delta_seconds,
+                        ToMicroSeconds(now - gc_grace_seconds - time_delta_seconds))
                   .Collectable(gc_grace_seconds));
   EXPECT_FALSE(Tombstone(ColumnTypeMask::DELETION_MASK, 0,
-                         now - gc_grace_seconds + 1,
-                         ToMicroSeconds(now - gc_grace_seconds + 1))
+                         now - gc_grace_seconds + time_delta_seconds,
+                         ToMicroSeconds(now - gc_grace_seconds + time_delta_seconds))
                    .Collectable(gc_grace_seconds));
 }