From: Bill Scales <bill_scales@uk.ibm.com>
Date: Wed, 25 Feb 2026 07:51:54 +0000 (+0000)
Subject: test: Fix unittest_peeringstate as 74218 has merged
X-Git-Tag: testing/wip-vshankar-testing-20260226.041846~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f294488fef7019315ba986f9663d1dbca25c7dfd;p=ceph-ci.git

test: Fix unittest_peeringstate as 74218 has merged

Fix merge conflict between unittest_peeringstate
(commit 87e3334de7bda6ac90f43ab1d9a7c6359dd10d35)
and fix for issue 74218 by fixing test case to
expect the new behavior.

Signed-off-by: Bill Scales <bill_scales@uk.ibm.com>
---

diff --git a/src/test/osd/TestPeeringState.cc b/src/test/osd/TestPeeringState.cc
index 52f2a18a098..4153f956d44 100644
--- a/src/test/osd/TestPeeringState.cc
+++ b/src/test/osd/TestPeeringState.cc
@@ -2871,11 +2871,7 @@ TEST_F(PeeringStateTest, PartialWritePeeringToActiveClean) {
   {
     std::map<shard_id_t,std::pair<eversion_t, eversion_t>> expected_pwlc;
     expected_pwlc[shard_id_t(1)] = std::pair(eversion_t(), expected);
-#ifndef ISSUE_74218
-    epoch_t expected_pwlc_epoch = 2;
-#else
     epoch_t expected_pwlc_epoch = osdmap->get_epoch();
-#endif
     verify_pwlc(expected_pwlc_epoch, expected_pwlc);
   }
 }
@@ -2910,11 +2906,7 @@ TEST_F(PeeringStateTest, PartialWriteNotCompletePeeringToActiveClean) {
   {
     std::map<shard_id_t,std::pair<eversion_t, eversion_t>> expected_pwlc;
     expected_pwlc[shard_id_t(1)] = std::pair(eversion_t(), expected);
-#ifndef ISSUE_74218
-    epoch_t expected_pwlc_epoch = 2;
-#else
     epoch_t expected_pwlc_epoch = osdmap->get_epoch();
-#endif
     verify_pwlc(expected_pwlc_epoch, expected_pwlc);
   }
 }