From: Samuel Just <sam.just@inktank.com>
Date: Sun, 2 Mar 2014 05:41:55 +0000 (-0800)
Subject: TestPGLog::merge_old_entry: ne.version cannot be oe.version
X-Git-Tag: v0.78~97^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=86b21e0b782bbcdfa36800aff8146086a44fbec0;p=ceph.git

TestPGLog::merge_old_entry: ne.version cannot be oe.version

Otherwise, it would not be divergent!

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

diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc
index 1744c145ef285..e7fa886064c64 100644
--- a/src/test/osd/TestPGLog.cc
+++ b/src/test/osd/TestPGLog.cc
@@ -251,36 +251,6 @@ TEST_F(PGLogTest, merge_old_entry) {
     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.
-  {
-    clear();
-
-    ObjectStore::Transaction t;
-    pg_log_entry_t oe;
-    oe.mod_desc.mark_unrollbackable();
-    pg_info_t info;
-    list<hobject_t> remove_snap;
-
-    oe.version = eversion_t(1,1);
-    log.add(oe);
-
-    EXPECT_FALSE(is_dirty());
-    EXPECT_TRUE(remove_snap.empty());
-    EXPECT_TRUE(t.empty());
-    EXPECT_FALSE(missing.have_missing());
-    EXPECT_EQ(1U, log.log.size());
-
-    TestHandler h(remove_snap);
-    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_EQ(1U, log.log.size());
-  }
-
   // the new entry (from the logs) has a version that is higher than
   // the old entry (from the log entry given in argument) : do
   // nothing and return false