Skip to content

Commit 61dee38

Browse files
authored
ThreadNet tests: make test output less verbose (#1685)
This small change makes the output of passing ThreadNet tests less verbose by allowing to use `tasty`'s `--hide-successes` CLI option. With this change, the output of the following test invocation: ``` cabal test -O0 cardano-test --test-options '--hide-successes -p "$2==\"AllegraMary ThreadNet\" && $3==\"simple convergence\""' ``` is still very verbose, but, in my opinion, is relatively readable: <details> <summary>Output with Change</summary> ``` Running 1 test suites... Test suite cardano-test: RUNNING... All 1 tests passed (34.91s) Test suite cardano-test: PASS Test suite logged to: /home/geo2a/Workspace/IOG/ouroboros-consensus/other-pr/dist-newstyle/build/x86_64-linux/ghc-9.6.7/ouroboros-consensus-cardano-0.25.1.0/t/cardano-test/noopt/test/ouroboros-consensus-cardano-0.25.1.0-cardano-test.log 1 of 1 test suites (1 of 1 test cases) passed. ``` </details> without the change, the output contains a series of long lines that make the output much more difficult to comprehend. When I see the output, I have a feeling that there's something wrong with this test, even though it is passing. This is especially annoying in CI output, when some other tests are actually failing. <details> <summary> Output on `main`</summary> ``` Test suite cardano-test: RUNNING... cardano AllegraMary ThreadNet simple convergence: OK (39.19s) +++ OK, passed 10 tests. Observed forge during a non-overlay slot in the second era (10 in total): 80% True 20% False ReachesEra2 label (10 in total): 90% pv Enabled, slots1 Enabled, slots2 Required, blocks2 True 10% pv Enabled, slots1 Blocked, slots2 Optional, blocks2 False average #txs/block (10 in total): 100% R_Btwn (0.0,1.0) final intersection depth, Allegra, count (9 in total): 100% 0 blocks final intersection depth, Allegra, k diff (9 in total): 56% k - 8 blocks 22% k - 10 blocks 22% k - 9 blocks final intersection depth, Allegra, k frac (9 in total): 100% k * 0.0 blocks final intersection depth, Mary, count (1 in total): 100% 0 blocks final intersection depth, Mary, k diff (1 in total): 100% k - 10 blocks final intersection depth, Mary, k frac (1 in total): 100% k * 0.0 blocks floor(4 * lastJoinSlot / numSlots) (10 in total): 100% Just 0 involves >=1 re-delegation (10 in total): 100% False k (10 in total): 50% NonZero {unNonZero = 8} 30% NonZero {unNonZero = 10} 20% NonZero {unNonZero = 9} minimumDegreeNodeTopology (10 in total): 60% Just 2 40% Just 1 partition duration, count (10 in total): 20% 3 slots 20% 7 slots 10% 1 slots 10% 10 slots 10% 12 slots 10% 13 slots 10% 5 slots 10% 6 slots partition duration, k frac (10 in total): 20% k * 0.3 slots 10% k * 0.1 slots 10% k * 0.6 slots 10% k * 0.7 slots 10% k * 0.8 slots 10% k * 0.9 slots 10% k * 1.0 slots 10% k * 1.5 slots 10% k * 1.6 slots partition in or abuts era (First era, Second era) (10 in total): 100% (True,False) shortestLength (k = NonZero {unNonZero = 10}) (3 in total): 67% ≈ (k = NonZero {unNonZero = 10}) << 522 33% ≈ (k = NonZero {unNonZero = 10}) << 138 shortestLength (k = NonZero {unNonZero = 8}) (5 in total): 80% ≈ (k = NonZero {unNonZero = 8}) << 136 20% ≈ (k = NonZero {unNonZero = 8}) << 264 shortestLength (k = NonZero {unNonZero = 9}) (2 in total): 50% ≈ (k = NonZero {unNonZero = 9}) << 265 50% ≈ (k = NonZero {unNonZero = 9}) << 521 updates (10 in total): 20% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 2 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 2 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) 10% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 1 % 2, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 1 % 2, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c2,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 1 % 2, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) 10% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 1 % 2, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 1 % 2, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1)]) (c2,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 1 % 2, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1)]) 10% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 2 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 2 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) 10% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 2 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 2 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c2,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 2 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) 10% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 3 % 10, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 3 % 10, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) (c2,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 3 % 10, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) (c3,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 3 % 10, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) 10% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 3 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 3 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) (c2,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 3 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1),ShelleyUpdatedPParams SNothing (EpochNo 3),ShelleyUpdatedPParams SNothing (EpochNo 4)]) 10% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 4 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 4 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c2,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 4 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c3,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 4 % 5, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) 10% (c0,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 9 % 10, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c1,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 9 % 10, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) (c2,[ShelleyUpdatedPParams (SJust (PParams (ShelleyPParams {sppMinFeeA = Coin 0, sppMinFeeB = Coin 0, sppMaxBBSize = 10000, sppMaxTxSize = 2048, sppMaxBHSize = 1000, sppKeyDeposit = Coin 0, sppPoolDeposit = CompactCoin {unCompactCoin = 0}, sppEMax = EpochInterval 0, sppNOpt = 100, sppA0 = 0 % 1, sppRho = 0 % 1, sppTau = 0 % 1, sppD = 9 % 10, sppExtraEntropy = NeutralNonce, sppProtocolVersion = ProtVer {pvMajor = Version 3, pvMinor = 0}, sppMinUTxOValue = Coin 0, sppMinPoolCost = Coin 0}))) (EpochNo 1),confirmed (Allegra,Mary,1),done (Allegra,Mary,1)]) All 1 tests passed (39.20s) Test suite cardano-test: PASS ``` </details>
2 parents 6dd15ad + 9434c53 commit 61dee38

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
157157
- name: Test
158158
if: matrix.test-set == 'all'
159-
run: cabal test all -j --test-show-details=streaming
159+
run: cabal test all -j --test-show-details=streaming --test-options '--hide-successes'
160160

161161
- name: Test (NoThunks-safe tests only)
162162
if: matrix.test-set == 'no-thunks-safe'

nix/haskell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ let
2828
ghcOptions = [ "-Werror" ];
2929
}))
3030
{
31-
# Options related to tasty-golden:
31+
# Options related to tasty and tasty-golden:
3232
packages.ouroboros-consensus-cardano.components.tests =
3333
lib.listToAttrs (builtins.map
3434
(n: lib.nameValuePair "${n}-test" {
35-
testFlags = lib.mkForce [ "--no-create" ];
35+
testFlags = lib.mkForce [ "--no-create --hide-successes" ];
3636
extraSrcFiles = [ "golden/${n}/**/*" ];
3737
}) [ "byron" "shelley" "cardano" ]);
3838
}

ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestEnv.hs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{-# LANGUAGE LambdaCase #-}
22
{-# LANGUAGE RecordWildCards #-}
33

4-
-- | A @tasty@ command-line option for enabling nightly tests
4+
-- | This module provides @tasty@ command-line options for enabling nightly tests
5+
-- and controlling test output verbosity
56
module Test.Util.TestEnv
67
( TestEnv (..)
78
, adjustQuickCheckMaxSize
@@ -17,6 +18,7 @@ import Main.Utf8 (withStdTerminalHandles)
1718
import Options.Applicative (metavar)
1819
import Test.Tasty
1920
import Test.Tasty.Ingredients
21+
import Test.Tasty.Ingredients.Basic (HideSuccesses (..))
2022
import Test.Tasty.Ingredients.Rerun
2123
import Test.Tasty.Options
2224
import Test.Tasty.QuickCheck
@@ -28,12 +30,15 @@ defaultMainWithTestEnv testConfig testTree = do
2830
cryptoInit
2931
withStdTerminalHandles $
3032
defaultMainWithIngredients
31-
[rerunningTests (testEnvIngredient : defaultIngredients)]
33+
[rerunningTests (hideSuccessIngredient : testEnvIngredient : defaultIngredients)]
3234
(withTestEnv testConfig testTree)
3335
where
3436
testEnvIngredient :: Ingredient
3537
testEnvIngredient = includingOptions [Option (Proxy :: Proxy TestEnv)]
3638

39+
hideSuccessIngredient :: Ingredient
40+
hideSuccessIngredient = includingOptions [Option (Proxy :: Proxy HideSuccesses)]
41+
3742
-- | Set the appropriate options for the test environment
3843
withTestEnv :: TestEnvConfig -> TestTree -> TestTree
3944
withTestEnv TestEnvConfig{..} testTree = askOption $ \case

0 commit comments

Comments
 (0)