From 14d0eb1db09af77d299ffafae392842080dabccf Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Thu, 19 Sep 2024 18:58:27 +0200 Subject: [PATCH] Reenable cardano-testnet-tests --- .../cardano-testnet-test.hs | 66 +++++++++++-------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs b/cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs index 18bfee7f7fe..dd5e46e6e9f 100644 --- a/cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs +++ b/cardano-testnet/test/cardano-testnet-test/cardano-testnet-test.hs @@ -5,11 +5,25 @@ module Main ) where import qualified Cardano.Crypto.Init as Crypto -import qualified Cardano.Testnet.Test.Cli.StakeSnapshot -import qualified Cardano.Testnet.Test.Cli.Transaction +import qualified Cardano.Testnet.Test.Cli.Conway.Plutus import qualified Cardano.Testnet.Test.Cli.KesPeriodInfo +import qualified Cardano.Testnet.Test.Cli.LeadershipSchedule +import qualified Cardano.Testnet.Test.Cli.Query import qualified Cardano.Testnet.Test.Cli.QuerySlotNumber +import qualified Cardano.Testnet.Test.Cli.StakeSnapshot +import qualified Cardano.Testnet.Test.Cli.Transaction import qualified Cardano.Testnet.Test.FoldEpochState +import qualified Cardano.Testnet.Test.Gov.CommitteeAddNew as Gov +import qualified Cardano.Testnet.Test.Gov.DRepDeposit as Gov +import qualified Cardano.Testnet.Test.Gov.DRepRetirement as Gov +import qualified Cardano.Testnet.Test.Gov.GovActionTimeout as Gov +import qualified Cardano.Testnet.Test.Gov.NoConfidence as Gov +import qualified Cardano.Testnet.Test.Gov.PParamChangeFailsSPO as Gov +import qualified Cardano.Testnet.Test.Gov.ProposeNewConstitution as Gov +import qualified Cardano.Testnet.Test.Gov.ProposeNewConstitutionSPO as Gov +import qualified Cardano.Testnet.Test.Gov.TreasuryDonation as Gov +import qualified Cardano.Testnet.Test.Gov.TreasuryGrowth as Gov +import qualified Cardano.Testnet.Test.Gov.TreasuryWithdrawal as Gov import qualified Cardano.Testnet.Test.Node.Shutdown import qualified Cardano.Testnet.Test.SanityCheck as LedgerEvents import qualified Cardano.Testnet.Test.SubmitApi.Transaction @@ -29,34 +43,30 @@ tests = do pure $ T.testGroup "test/Spec.hs" [ T.testGroup "Spec" [ T.testGroup "Ledger Events" - [ ignoreOnWindows "Sanity Check" LedgerEvents.hprop_ledger_events_sanity_check - -- , ignoreOnWindows "Treasury Growth" Gov.prop_check_if_treasury_is_growing + [ ignoreOnWindows "Sanity Check" LedgerEvents.hprop_ledger_events_sanity_check + , ignoreOnWindows "Treasury Growth" Gov.prop_check_if_treasury_is_growing -- TODO: Replace foldBlocks with checkConditionResult -- TODO: All governance related tests disabled in cardano-node-9.2 due to flakiness - --, T.testGroup "Governance" - -- [ ignoreOnMacAndWindows "Committee Add New" Gov.hprop_constitutional_committee_add_new - -- Committee Motion Of No Confidence - disabled in cardano-node-9.2 - -- , ignoreOnMacAndWindows "Committee Motion Of No Confidence" Gov.hprop_gov_no_confidence + , T.testGroup "Governance" + [ ignoreOnMacAndWindows "Committee Add New" Gov.hprop_constitutional_committee_add_new + , ignoreOnMacAndWindows "Committee Motion Of No Confidence" Gov.hprop_gov_no_confidence -- TODO: Disabled because proposals for parameter changes are not working -- , ignoreOnWindows "DRep Activity" Gov.hprop_check_drep_activity - -- , ignoreOnWindows "Predefined Abstain DRep" Gov.hprop_check_predefined_abstain_drep - -- DRep Deposits flakey - disabled in cardano-node-9.2 - -- , ignoreOnWindows "DRep Deposits" Gov.hprop_ledger_events_drep_deposits - -- , ignoreOnWindows "DRep Retirement" Gov.hprop_drep_retirement - -- , ignoreOnMacAndWindows "Propose And Ratify New Constitution" Gov.hprop_ledger_events_propose_new_constitution - -- , ignoreOnWindows "Propose New Constitution SPO" Gov.hprop_ledger_events_propose_new_constitution_spo - -- , ignoreOnWindows "Gov Action Timeout" Gov.hprop_check_gov_action_timeout - -- , ignoreOnWindows "Treasury Donation" Gov.hprop_ledger_events_treasury_donation - -- Treasury Withdrawal flakey - disabled in cardano-node-9.2 - -- , ignoreOnMacAndWindows "Treasury Withdrawal" Gov.hprop_ledger_events_treasury_withdrawal - -- , ignoreOnWindows "PParam change fails for SPO" Gov.hprop_check_pparam_fails_spo + -- , ignoreOnWindows "Predefined Abstain DRep" Gov.hprop_check_predefined_abstain_drep + , ignoreOnWindows "DRep Deposits" Gov.hprop_ledger_events_drep_deposits + , ignoreOnWindows "DRep Retirement" Gov.hprop_drep_retirement + , ignoreOnMacAndWindows "Propose And Ratify New Constitution" Gov.hprop_ledger_events_propose_new_constitution + , ignoreOnWindows "Propose New Constitution SPO" Gov.hprop_ledger_events_propose_new_constitution_spo + , ignoreOnWindows "Gov Action Timeout" Gov.hprop_check_gov_action_timeout + , ignoreOnWindows "Treasury Donation" Gov.hprop_ledger_events_treasury_donation + , ignoreOnMacAndWindows "Treasury Withdrawal" Gov.hprop_ledger_events_treasury_withdrawal + , ignoreOnWindows "PParam change fails for SPO" Gov.hprop_check_pparam_fails_spo -- FIXME Those tests are flaky -- , ignoreOnWindows "InfoAction" LedgerEvents.hprop_ledger_events_info_action ] - -- Plutus flakey - disabled in cardano-node-9.2 - -- , T.testGroup "Plutus" - -- [ ignoreOnWindows "PlutusV3" Cardano.Testnet.Test.Cli.Conway.Plutus.hprop_plutus_v3] - + , T.testGroup "Plutus" + [ ignoreOnWindows "PlutusV3" Cardano.Testnet.Test.Cli.Conway.Plutus.hprop_plutus_v3] + ] , T.testGroup "CLI" [ ignoreOnWindows "Shutdown" Cardano.Testnet.Test.Node.Shutdown.hprop_shutdown -- ShutdownOnSigint fails on Mac with @@ -66,8 +76,7 @@ tests = do -- , ignoreOnWindows "ShutdownOnSlotSynced" Cardano.Testnet.Test.Node.Shutdown.hprop_shutdownOnSlotSynced , ignoreOnWindows "stake-snapshot" Cardano.Testnet.Test.Cli.StakeSnapshot.hprop_stakeSnapshot , ignoreOnWindows "simple transaction build" Cardano.Testnet.Test.Cli.Transaction.hprop_transaction - -- "leadership-schedule" flakey - disabled in cardano-node-9.2 - -- , ignoreOnMacAndWindows "leadership-schedule" Cardano.Testnet.Test.Cli.LeadershipSchedule.hprop_leadershipSchedule + , ignoreOnMacAndWindows "leadership-schedule" Cardano.Testnet.Test.Cli.LeadershipSchedule.hprop_leadershipSchedule -- TODO: Conway - Re-enable when create-staked is working in conway again --, T.testGroup "Conway" @@ -78,13 +87,12 @@ tests = do , ignoreOnWindows "kes-period-info" Cardano.Testnet.Test.Cli.KesPeriodInfo.hprop_kes_period_info , ignoreOnWindows "query-slot-number" Cardano.Testnet.Test.Cli.QuerySlotNumber.hprop_querySlotNumber , ignoreOnWindows "foldEpochState receives ledger state" Cardano.Testnet.Test.FoldEpochState.prop_foldEpochState - -- , ignoreOnMacAndWindows "CliQueries" Cardano.Testnet.Test.Cli.Query.hprop_cli_queries + , ignoreOnMacAndWindows "CliQueries" Cardano.Testnet.Test.Cli.Query.hprop_cli_queries ] ] , T.testGroup "SubmitApi" - [ ignoreOnMacAndWindows "transaction" Cardano.Testnet.Test.SubmitApi.Transaction.hprop_transaction - ] - + [ ignoreOnMacAndWindows "transaction" Cardano.Testnet.Test.SubmitApi.Transaction.hprop_transaction + ] ] main :: IO ()