From c44298655f4728df6508f94baa499972b6332e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Eckel?= Date: Mon, 11 Mar 2024 10:13:30 +0100 Subject: [PATCH] moved util.TerminationWaitGroup.Wait() to the central network cleanup method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Eckel --- tests/e2e/asset/suite.go | 2 -- tests/e2e/dao/basic/suite.go | 2 -- tests/e2e/dao/distribution/asset_distribution_suite.go | 2 -- tests/e2e/dao/gas/gas_consumption_suite.go | 2 -- tests/e2e/dao/msgs/restricted_msgs_suite.go | 2 -- tests/e2e/dao/pop/selection_suite.go | 2 -- tests/e2e/machine/suite.go | 2 -- testutil/network/network.go | 3 +++ 8 files changed, 3 insertions(+), 14 deletions(-) diff --git a/tests/e2e/asset/suite.go b/tests/e2e/asset/suite.go index 90f2117..7e27c56 100644 --- a/tests/e2e/asset/suite.go +++ b/tests/e2e/asset/suite.go @@ -4,7 +4,6 @@ import ( "github.com/planetmint/planetmint-go/lib" "github.com/planetmint/planetmint-go/testutil/network" "github.com/planetmint/planetmint-go/testutil/sample" - "github.com/planetmint/planetmint-go/util" clitestutil "github.com/planetmint/planetmint-go/testutil/cli" e2etestutil "github.com/planetmint/planetmint-go/testutil/e2e" @@ -39,7 +38,6 @@ func (s *E2ETestSuite) SetupSuite() { // TearDownSuite clean up after testing func (s *E2ETestSuite) TearDownSuite() { - util.TerminationWaitGroup.Wait() s.T().Log("tearing down e2e asset test suite") } diff --git a/tests/e2e/dao/basic/suite.go b/tests/e2e/dao/basic/suite.go index 2cd83e2..25fdc83 100644 --- a/tests/e2e/dao/basic/suite.go +++ b/tests/e2e/dao/basic/suite.go @@ -14,7 +14,6 @@ import ( e2etestutil "github.com/planetmint/planetmint-go/testutil/e2e" "github.com/planetmint/planetmint-go/testutil/network" "github.com/planetmint/planetmint-go/testutil/sample" - "github.com/planetmint/planetmint-go/util" daocli "github.com/planetmint/planetmint-go/x/dao/client/cli" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" @@ -110,7 +109,6 @@ func (s *E2ETestSuite) SetupSuite() { // TearDownSuite clean up after testing func (s *E2ETestSuite) TearDownSuite() { - util.TerminationWaitGroup.Wait() s.T().Log("tearing down e2e dao test suite") } diff --git a/tests/e2e/dao/distribution/asset_distribution_suite.go b/tests/e2e/dao/distribution/asset_distribution_suite.go index 89dedbb..7b6a86d 100644 --- a/tests/e2e/dao/distribution/asset_distribution_suite.go +++ b/tests/e2e/dao/distribution/asset_distribution_suite.go @@ -6,7 +6,6 @@ import ( clitestutil "github.com/planetmint/planetmint-go/testutil/cli" "github.com/planetmint/planetmint-go/testutil/network" - "github.com/planetmint/planetmint-go/util" daocli "github.com/planetmint/planetmint-go/x/dao/client/cli" daotypes "github.com/planetmint/planetmint-go/x/dao/types" "github.com/stretchr/testify/suite" @@ -42,7 +41,6 @@ func (s *AssetDistributionE2ETestSuite) SetupSuite() { } func (s *AssetDistributionE2ETestSuite) TearDownSuite() { - util.TerminationWaitGroup.Wait() s.T().Log("tearing down e2e dao distribution test suites") } diff --git a/tests/e2e/dao/gas/gas_consumption_suite.go b/tests/e2e/dao/gas/gas_consumption_suite.go index 6ba432d..f167d51 100644 --- a/tests/e2e/dao/gas/gas_consumption_suite.go +++ b/tests/e2e/dao/gas/gas_consumption_suite.go @@ -15,7 +15,6 @@ import ( "github.com/planetmint/planetmint-go/testutil/moduleobject" "github.com/planetmint/planetmint-go/testutil/network" "github.com/planetmint/planetmint-go/testutil/sample" - "github.com/planetmint/planetmint-go/util" daotypes "github.com/planetmint/planetmint-go/x/dao/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" @@ -94,7 +93,6 @@ func (s *ConsumptionE2ETestSuite) SetupSuite() { } func (s *ConsumptionE2ETestSuite) TearDownSuite() { - util.TerminationWaitGroup.Wait() s.T().Log("tearing down e2e dao gas consumption test suites") } diff --git a/tests/e2e/dao/msgs/restricted_msgs_suite.go b/tests/e2e/dao/msgs/restricted_msgs_suite.go index 67bb2e9..50c8f11 100644 --- a/tests/e2e/dao/msgs/restricted_msgs_suite.go +++ b/tests/e2e/dao/msgs/restricted_msgs_suite.go @@ -6,7 +6,6 @@ import ( e2etestutil "github.com/planetmint/planetmint-go/testutil/e2e" "github.com/planetmint/planetmint-go/testutil/network" "github.com/planetmint/planetmint-go/testutil/sample" - "github.com/planetmint/planetmint-go/util" daotypes "github.com/planetmint/planetmint-go/x/dao/types" machinetypes "github.com/planetmint/planetmint-go/x/machine/types" "github.com/stretchr/testify/suite" @@ -45,7 +44,6 @@ func (s *RestrictedMsgsE2ESuite) SetupSuite() { } func (s *RestrictedMsgsE2ESuite) TearDownSuite() { - util.TerminationWaitGroup.Wait() s.T().Log("tearing down e2e dao restricted msg test suite") } diff --git a/tests/e2e/dao/pop/selection_suite.go b/tests/e2e/dao/pop/selection_suite.go index a437dd8..f99f13e 100644 --- a/tests/e2e/dao/pop/selection_suite.go +++ b/tests/e2e/dao/pop/selection_suite.go @@ -17,7 +17,6 @@ import ( e2etestutil "github.com/planetmint/planetmint-go/testutil/e2e" "github.com/planetmint/planetmint-go/testutil/network" "github.com/planetmint/planetmint-go/testutil/sample" - "github.com/planetmint/planetmint-go/util" daocli "github.com/planetmint/planetmint-go/x/dao/client/cli" daotypes "github.com/planetmint/planetmint-go/x/dao/types" "github.com/stretchr/testify/assert" @@ -87,7 +86,6 @@ func (s *SelectionE2ETestSuite) SetupSuite() { // TearDownSuite clean up after testing func (s *SelectionE2ETestSuite) TearDownSuite() { - util.TerminationWaitGroup.Wait() s.T().Log("tearing down e2e dao pop selection test suite") } diff --git a/tests/e2e/machine/suite.go b/tests/e2e/machine/suite.go index d2a8cff..3f38e93 100644 --- a/tests/e2e/machine/suite.go +++ b/tests/e2e/machine/suite.go @@ -5,7 +5,6 @@ import ( clitestutil "github.com/planetmint/planetmint-go/testutil/cli" "github.com/planetmint/planetmint-go/testutil/network" "github.com/planetmint/planetmint-go/testutil/sample" - "github.com/planetmint/planetmint-go/util" machinecli "github.com/planetmint/planetmint-go/x/machine/client/cli" machinetypes "github.com/planetmint/planetmint-go/x/machine/types" @@ -50,7 +49,6 @@ func (s *E2ETestSuite) SetupSuite() { // TearDownSuite clean up after testing func (s *E2ETestSuite) TearDownSuite() { - util.TerminationWaitGroup.Wait() s.T().Log("tearing down e2e machine test suite") } diff --git a/testutil/network/network.go b/testutil/network/network.go index 06227a0..30b171c 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -24,6 +24,7 @@ import ( "github.com/planetmint/planetmint-go/config" "github.com/planetmint/planetmint-go/lib" "github.com/planetmint/planetmint-go/testutil/sample" + "github.com/planetmint/planetmint-go/util" "github.com/spf13/cobra" "google.golang.org/grpc" @@ -766,6 +767,8 @@ func (n *Network) Cleanup() { } } } + // waiting for all threads to be terminated + util.TerminationWaitGroup.Wait() // Give a brief pause for things to finish closing in other processes. Hopefully this helps with the address-in-use errors. // 100ms chosen randomly.