fix false positive in test

Author: crocodile-dentist

ouroboros-network/changelog.d/20251004_134906_crocodile-dentist_test_false_positive.md

@@ -0,0 +1,17 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+<!--
+### Breaking
+
+- A bullet item for the Breaking category.
+
+-->
+
+### Non-Breaking
+
+- fix test false positive

ouroboros-network/testlib/Test/Ouroboros/Network/Diffusion/Testnet/Cardano.hs

@@ -17,6 +17,7 @@
 
 module Test.Ouroboros.Network.Diffusion.Testnet.Cardano (tests) where
 
+import Control.Arrow ((&&&))
 import Control.Exception (AssertionFailed (..), catch, displayException,
            evaluate, fromException)
 import Control.Monad.Class.MonadFork
@@ -2939,9 +2940,12 @@ prop_diffusion_target_active_below ioSimTrace traceNumber =
             . selectDiffusionPeerSelectionEvents
             $ events
 
-          govInProgressPromoteWarmSig :: Signal (Set NtNAddr)
-          govInProgressPromoteWarmSig =
-            selectDiffusionPeerSelectionState Governor.inProgressPromoteWarm  events
+          govInProgressIneligibleSig :: Signal (Set NtNAddr)
+          govInProgressIneligibleSig =
+            selectDiffusionPeerSelectionState
+            (uncurry Set.union . (    Governor.inProgressPromoteWarm
+                                  &&& Governor.inProgressDemoteWarm))
+            events
 
           trJoinKillSig :: Signal JoinedOrKilled
           trJoinKillSig =
@@ -2982,13 +2986,13 @@ prop_diffusion_target_active_below ioSimTrace traceNumber =
           -- root peer group.
           --
           promotionOpportunity target local established active recentFailures isAlive
-                               inProgressDemoteToCold inProgressPromoteWarm
+                               inProgressDemoteToCold inProgressIneligible
             | isAlive && Set.size active < target
             = established Set.\\ active
                           Set.\\ LocalRootPeers.keysSet local
                           Set.\\ recentFailures
                           Set.\\ inProgressDemoteToCold
-                          Set.\\ inProgressPromoteWarm
+                          Set.\\ inProgressIneligible
 
             | otherwise
             = Set.empty
@@ -3003,7 +3007,7 @@ prop_diffusion_target_active_below ioSimTrace traceNumber =
               <*> govActiveFailuresSig
               <*> trIsNodeAlive
               <*> govInProgressDemoteToColdSig
-              <*> govInProgressPromoteWarmSig
+              <*> govInProgressIneligibleSig
 
           promotionOpportunitiesIgnoredTooLong :: Signal (Set NtNAddr)
           promotionOpportunitiesIgnoredTooLong =
@@ -3015,16 +3019,16 @@ prop_diffusion_target_active_below ioSimTrace traceNumber =
        in counterexample
             ("\nSignal key: (local, established peers, active peers, " ++
              "recent failures, opportunities, is node running, ignored too long)") $
-          counterexample
-            (List.intercalate "\n" $ map show $ Signal.eventsToList events) $
+          -- counterexample
+          --   (List.intercalate "\n" $ map show $ Signal.eventsToList events) $
 
           signalProperty 20 show
             (\(_, _, _, _, _, _, toolong) -> Set.null toolong)
             ((,,,,,,) <$> govLocalRootPeersSig
                  <*> govEstablishedPeersSig
                  <*> govActivePeersSig
                  <*> govActiveFailuresSig
-                 <*> govInProgressPromoteWarmSig
+                 <*> govInProgressIneligibleSig
                  <*> trIsNodeAlive
                  <*> promotionOpportunitiesIgnoredTooLong
             )