From 453a1059df18311578a85846b1cff16963c1d65f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Wed, 6 Mar 2024 09:09:50 +0100 Subject: [PATCH] * removed parallel-testing from e2e machine test suite * improved test suite logging MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- lib/tests/e2e/suite.go | 4 ++-- tests/e2e/asset/suite.go | 4 ++-- tests/e2e/dao/asset_distribution_suite.go | 4 ++-- tests/e2e/dao/gas_consumption_suite.go | 4 ++-- tests/e2e/dao/pop_participant_selection_suite.go | 4 ++-- tests/e2e/dao/restricted_msgs_suite.go | 4 ++-- tests/e2e/dao/suite.go | 4 ++-- tests/e2e/machine/cli_test.go | 1 - tests/e2e/machine/suite.go | 4 ++-- 9 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/tests/e2e/suite.go b/lib/tests/e2e/suite.go index 8a9a443..baf2c88 100644 --- a/lib/tests/e2e/suite.go +++ b/lib/tests/e2e/suite.go @@ -29,14 +29,14 @@ func NewE2ETestSuite(cfg network.Config) *E2ETestSuite { // SetupSuite initializes machine E2ETestSuite func (s *E2ETestSuite) SetupSuite() { - s.T().Log("setting up e2e test suite") + s.T().Log("setting up e2e lib test suite") s.network = network.New(s.T()) } // TearDownSuite clean up after testing func (s *E2ETestSuite) TearDownSuite() { - s.T().Log("tearing down e2e test suite") + s.T().Log("tearing down e2e lib test suite") } func (s *E2ETestSuite) TestBankSendBroadcastTxWithFileLock() { diff --git a/tests/e2e/asset/suite.go b/tests/e2e/asset/suite.go index b5ec3ac..90f2117 100644 --- a/tests/e2e/asset/suite.go +++ b/tests/e2e/asset/suite.go @@ -30,7 +30,7 @@ func NewE2ETestSuite(cfg network.Config) *E2ETestSuite { // SetupSuite initializes asset E2ETestSuite func (s *E2ETestSuite) SetupSuite() { - s.T().Log("setting up e2e test suite") + s.T().Log("setting up e2e asset test suite") s.network = network.Load(s.T(), s.cfg) err := e2etestutil.AttestMachine(s.network, sample.Name, sample.Mnemonic, 0, sample.FeeDenom) @@ -40,7 +40,7 @@ func (s *E2ETestSuite) SetupSuite() { // TearDownSuite clean up after testing func (s *E2ETestSuite) TearDownSuite() { util.TerminationWaitGroup.Wait() - s.T().Log("tearing down e2e test suite") + s.T().Log("tearing down e2e asset test suite") } // TestNotarizeAsset notarizes asset over cli diff --git a/tests/e2e/dao/asset_distribution_suite.go b/tests/e2e/dao/asset_distribution_suite.go index 3f6a000..f342ec0 100644 --- a/tests/e2e/dao/asset_distribution_suite.go +++ b/tests/e2e/dao/asset_distribution_suite.go @@ -26,7 +26,7 @@ func NewAssetDistributionE2ETestSuite(cfg network.Config) *AssetDistributionE2ET } func (s *AssetDistributionE2ETestSuite) SetupSuite() { - s.T().Log("setting up e2e test suite") + s.T().Log("setting up e2e dao distribution test suite") // set epochs: make sure to start after initial height of 7 s.distributionOffset = 5 @@ -43,7 +43,7 @@ func (s *AssetDistributionE2ETestSuite) SetupSuite() { func (s *AssetDistributionE2ETestSuite) TearDownSuite() { util.TerminationWaitGroup.Wait() - s.T().Log("tearing down e2e test suites") + s.T().Log("tearing down e2e dao distribution test suites") } func (s *AssetDistributionE2ETestSuite) TestAssetDistribution() { diff --git a/tests/e2e/dao/gas_consumption_suite.go b/tests/e2e/dao/gas_consumption_suite.go index 9daa34c..c9520d7 100644 --- a/tests/e2e/dao/gas_consumption_suite.go +++ b/tests/e2e/dao/gas_consumption_suite.go @@ -64,7 +64,7 @@ func (s *GasConsumptionE2ETestSuite) createValAccount(cfg network.Config) (addre } func (s *GasConsumptionE2ETestSuite) SetupSuite() { - s.T().Log("setting up e2e test suite") + s.T().Log("setting up e2e dao gas consumption test suite") s.feeDenom = sample.FeeDenom s.cfg.Mnemonics = []string{sample.Mnemonic} @@ -95,7 +95,7 @@ func (s *GasConsumptionE2ETestSuite) SetupSuite() { func (s *GasConsumptionE2ETestSuite) TearDownSuite() { util.TerminationWaitGroup.Wait() - s.T().Log("tearing down e2e test suites") + s.T().Log("tearing down e2e dao gas consumption test suites") } func (s *GasConsumptionE2ETestSuite) TestValidatorConsumption() { diff --git a/tests/e2e/dao/pop_participant_selection_suite.go b/tests/e2e/dao/pop_participant_selection_suite.go index 70b250f..af7a42d 100644 --- a/tests/e2e/dao/pop_participant_selection_suite.go +++ b/tests/e2e/dao/pop_participant_selection_suite.go @@ -62,7 +62,7 @@ func NewPopSelectionE2ETestSuite(cfg network.Config) *PopSelectionE2ETestSuite { } func (s *PopSelectionE2ETestSuite) SetupSuite() { - s.T().Log("setting up e2e test suite") + s.T().Log("setting up e2e dao pop selection test suite") s.popEpochs = 10 s.reissuanceEpochs = 60 @@ -88,7 +88,7 @@ func (s *PopSelectionE2ETestSuite) SetupSuite() { // TearDownSuite clean up after testing func (s *PopSelectionE2ETestSuite) TearDownSuite() { util.TerminationWaitGroup.Wait() - s.T().Log("tearing down e2e test suite") + s.T().Log("tearing down e2e dao pop selection test suite") } func (s *PopSelectionE2ETestSuite) perpareLocalTest() testutil.BufferWriter { diff --git a/tests/e2e/dao/restricted_msgs_suite.go b/tests/e2e/dao/restricted_msgs_suite.go index 46e1cdc..35749b5 100644 --- a/tests/e2e/dao/restricted_msgs_suite.go +++ b/tests/e2e/dao/restricted_msgs_suite.go @@ -35,7 +35,7 @@ func NewRestrictedMsgsE2ESuite(cfg network.Config) *RestrictedMsgsE2ESuite { } func (s *RestrictedMsgsE2ESuite) SetupSuite() { - s.T().Log("setting up e2e test suite") + s.T().Log("setting up e2e dao restricted msg test suite") s.network = network.Load(s.T(), s.cfg) account, err := e2etestutil.CreateAccount(s.network, sample.Name, sample.Mnemonic) @@ -46,7 +46,7 @@ func (s *RestrictedMsgsE2ESuite) SetupSuite() { func (s *RestrictedMsgsE2ESuite) TearDownSuite() { util.TerminationWaitGroup.Wait() - s.T().Log("tearing down e2e test suite") + s.T().Log("tearing down e2e dao restricted msg test suite") } func (s *RestrictedMsgsE2ESuite) TestRestrictedMsgsValidator() { diff --git a/tests/e2e/dao/suite.go b/tests/e2e/dao/suite.go index 04d2db0..b141f82 100644 --- a/tests/e2e/dao/suite.go +++ b/tests/e2e/dao/suite.go @@ -49,7 +49,7 @@ func (s *E2ETestSuite) SetupSuite() { s.reissuanceEpochs = 25 s.distributionOffset = 5 - s.T().Log("setting up e2e test suite") + s.T().Log("setting up e2e dao test suite") // Setup MintAddress parameter in genesis state // use sample.Mnemonic to make mint address deterministic for test @@ -111,7 +111,7 @@ func (s *E2ETestSuite) SetupSuite() { // TearDownSuite clean up after testing func (s *E2ETestSuite) TearDownSuite() { util.TerminationWaitGroup.Wait() - s.T().Log("tearing down e2e test suite") + s.T().Log("tearing down e2e dao test suite") } func (s *E2ETestSuite) TestMintToken() { diff --git a/tests/e2e/machine/cli_test.go b/tests/e2e/machine/cli_test.go index 11952c1..312820d 100644 --- a/tests/e2e/machine/cli_test.go +++ b/tests/e2e/machine/cli_test.go @@ -9,7 +9,6 @@ import ( ) func TestE2EMachineTestSuite(t *testing.T) { - t.Parallel() cfg := network.LoaderDefaultConfig() cfg.NumValidators = 3 suite.Run(t, NewE2ETestSuite(cfg)) diff --git a/tests/e2e/machine/suite.go b/tests/e2e/machine/suite.go index fa58d52..cf81d44 100644 --- a/tests/e2e/machine/suite.go +++ b/tests/e2e/machine/suite.go @@ -36,7 +36,7 @@ func NewE2ETestSuite(cfg network.Config) *E2ETestSuite { // SetupSuite initializes machine E2ETestSuite func (s *E2ETestSuite) SetupSuite() { - s.T().Log("setting up e2e test suite") + s.T().Log("setting up e2e machine test suite") s.feeDenom = sample.FeeDenom s.network = network.Load(s.T(), s.cfg) @@ -51,7 +51,7 @@ func (s *E2ETestSuite) SetupSuite() { // TearDownSuite clean up after testing func (s *E2ETestSuite) TearDownSuite() { util.TerminationWaitGroup.Wait() - s.T().Log("tearing down e2e test suite") + s.T().Log("tearing down e2e machine test suite") } // TestAttestMachine attests machine and query attested machine from chain