From: Samuel Just <sam.just@inktank.com>
Date: Sat, 1 Mar 2014 23:22:53 +0000 (-0800)
Subject: TestPGLog: not worth maintaining tests of assert behavior
X-Git-Tag: v0.78~97^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cc9e2262ced92b126417f70afdd81927d17690b;p=ceph.git

TestPGLog: not worth maintaining tests of assert behavior

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc
index bc5b4e40fd18..0c8fb6cd4620 100644
--- a/src/test/osd/TestPGLog.cc
+++ b/src/test/osd/TestPGLog.cc
@@ -250,40 +250,6 @@ TEST_F(PGLogTest, merge_old_entry) {
     EXPECT_TRUE(log.empty());
   }
 
-  // a clone with no non-divergent log entry is deleted
-  {
-    clear();
-
-    ObjectStore::Transaction t;
-    pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
-    pg_info_t info;
-    list<hobject_t> remove_snap;
-
-    oe.op = pg_log_entry_t::CLONE;
-
-    oe.soid.snap = CEPH_NOSNAP;
-    TestHandler h(remove_snap);
-    EXPECT_THROW(merge_old_entry(t, oe, info, &h), FailedAssertion);
-    oe.soid.snap = 1U;
-    missing.add(oe.soid, eversion_t(), eversion_t());
-
-    EXPECT_FALSE(is_dirty());
-    EXPECT_TRUE(remove_snap.empty());
-    EXPECT_TRUE(t.empty());
-    EXPECT_TRUE(missing.have_missing());
-    EXPECT_TRUE(missing.is_missing(oe.soid));
-    EXPECT_TRUE(log.empty());
-
-    EXPECT_FALSE(merge_old_entry(t, oe, info, &h));
-
-    EXPECT_FALSE(is_dirty());
-    EXPECT_EQ(oe.soid, remove_snap.front());
-    EXPECT_TRUE(t.empty());
-    EXPECT_FALSE(missing.have_missing());
-    EXPECT_TRUE(log.empty());
-  }
-
   // the new entry (from the logs) old entry (from the log entry
   // given in argument) have the same version : do nothing and return true.
   {