From 30a26a7b7a86bc546559cd07260f83732a57938c Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Thu, 29 Mar 2018 11:40:09 +0200 Subject: [PATCH] tests: remove TestPGLog ASSERT_DEATH test Fixes: http://tracker.ceph.com/issues/23504 Signed-off-by: Nathan Cutler (cherry picked from commit adcba97a41795c25de8b6dfe263a1014564a305f) Conflicts: src/test/osd/TestPGLog.cc (the code being removed is slightly different in jewel) --- src/test/osd/TestPGLog.cc | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/test/osd/TestPGLog.cc b/src/test/osd/TestPGLog.cc index 6fae74ab43253..e65a2ae7f6614 100644 --- a/src/test/osd/TestPGLog.cc +++ b/src/test/osd/TestPGLog.cc @@ -1205,27 +1205,6 @@ TEST_F(PGLogTest, merge_log) { EXPECT_TRUE(dirty_big_info); } - // If our log is empty, the incoming log needs to have not been trimmed. - { - clear(); - - ObjectStore::Transaction t; - pg_log_t olog; - pg_info_t oinfo; - pg_shard_t fromosd; - pg_info_t info; - list remove_snap; - bool dirty_info = false; - bool dirty_big_info = false; - - // olog has been trimmed - olog.tail = eversion_t(1, 1); - - TestHandler h(remove_snap); - ASSERT_DEATH(merge_log(t, oinfo, olog, fromosd, info, &h, - dirty_info, dirty_big_info), ""); - } - } TEST_F(PGLogTest, proc_replica_log) { -- 2.39.5