From: Samuel Just <sam.just@inktank.com>
Date: Mon, 17 Feb 2014 22:20:44 +0000 (-0800)
Subject: TestPGLog: remove test with DELETE op with prior_version = eversion_t()
X-Git-Tag: v0.78~163^2~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f678aefde3f1d18c92d507b47ba6254d3a8c55b9;p=ceph.git

TestPGLog: remove test with DELETE op with prior_version = eversion_t()

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

diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc
index 39af882983e..c62954b86a4 100644
--- a/src/test/osd/TestPGLog.cc
+++ b/src/test/osd/TestPGLog.cc
@@ -619,43 +619,6 @@ TEST_F(PGLogTest, merge_old_entry) {
     EXPECT_EQ(oe.soid, divergent_priors[oe.prior_version]);
   }
 
-  // there is no new entry (from the logs) and
-  // the old entry (from the log entry given in argument) is not a CLONE and
-  // the old entry (from the log entry given in argument) is a DELETE and
-  // the old entry prior_version is eversion_t() :
-  //   remove the prior_version of the object from missing, if any and
-  //   return false
-  {
-    clear();
-
-    ObjectStore::Transaction t;
-    pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
-    pg_info_t info;
-    list<hobject_t> remove_snap;
-
-    info.log_tail = eversion_t(10,1);
-    oe.soid.hash = 1;
-    oe.op = pg_log_entry_t::DELETE;
-    oe.prior_version = eversion_t();
-
-    missing.add(oe.soid, eversion_t(1,1), eversion_t());
-
-    EXPECT_FALSE(is_dirty());
-    EXPECT_TRUE(remove_snap.empty());
-    EXPECT_TRUE(t.empty());
-    EXPECT_TRUE(missing.is_missing(oe.soid));
-    EXPECT_TRUE(log.empty());
-
-    TestHandler h(remove_snap);
-    EXPECT_FALSE(merge_old_entry(t, oe, info, &h));
-
-    EXPECT_FALSE(is_dirty());
-    EXPECT_TRUE(remove_snap.empty());
-    EXPECT_TRUE(t.empty());
-    EXPECT_FALSE(missing.have_missing());
-    EXPECT_TRUE(log.empty());
-  }
 
   // there is no new entry (from the logs) and
   // the old entry (from the log entry given in argument) is not a CLONE and