From f294488fef7019315ba986f9663d1dbca25c7dfd Mon Sep 17 00:00:00 2001 From: Bill Scales Date: Wed, 25 Feb 2026 07:51:54 +0000 Subject: [PATCH] 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 --- src/test/osd/TestPeeringState.cc | 8 -------- 1 file changed, 8 deletions(-) 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> 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> 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); } } -- 2.47.3