Merge pull request #6047 from multiversx/integration-tests-calling-re…

…factor Uniformized the calling methods for integration tests
multiversx · Mar 20, 2024 · b70bd26 · b70bd26
2 parents 5c3ca8c + d2b1804
commit b70bd26
Show file tree

Hide file tree

Showing 92 changed files with 1,073 additions and 397 deletions.
diff --git a/factory/status/statusComponents_test.go b/factory/status/statusComponents_test.go
@@ -2,7 +2,6 @@ package status_test
 
 import (
 	"errors"
-	"runtime"
 	"testing"
 
 	"github.com/multiversx/mx-chain-communication-go/websocket/data"
@@ -136,7 +135,9 @@ func TestNewStatusComponentsFactory(t *testing.T) {
 }
 
 func TestStatusComponentsFactory_Create(t *testing.T) {
-	// no t.Parallel for these tests as they create real components
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
 
 	t.Run("NewSoftwareVersionFactory fails should return error", func(t *testing.T) {
 		args := createMockStatusComponentsFactoryArgs()
@@ -188,10 +189,6 @@ func TestStatusComponentsFactory_Create(t *testing.T) {
 		require.Nil(t, sc)
 	})
 	t.Run("should work", func(t *testing.T) {
-		if runtime.GOOS == "darwin" && runtime.GOARCH == "amd64" {
-			t.Skip("skipping test on darwin amd64")
-		}
-
 		shardCoordinator := mock.NewMultiShardsCoordinatorMock(2)
 		shardCoordinator.SelfIDCalled = func() uint32 {
 			return core.MetachainShardId // coverage

diff --git a/genesis/process/genesisBlockCreator_test.go b/genesis/process/genesisBlockCreator_test.go
@@ -1,7 +1,5 @@
 //go:build !race
 
-// TODO reinstate test after Wasm VM pointer fix
-
 package process
 
 import (
@@ -180,7 +178,7 @@ func createMockArgument(
 				SCDeployEnableEpoch:               unreachableEpoch,
 				CleanUpInformativeSCRsEnableEpoch: unreachableEpoch,
 				SCProcessorV2EnableEpoch:          unreachableEpoch,
-				StakeLimitsEnableEpoch:         10,
+				StakeLimitsEnableEpoch:            10,
 			},
 		},
 		RoundConfig:             testscommon.GetDefaultRoundsConfig(),
@@ -897,9 +895,9 @@ func TestCreateArgsGenesisBlockCreator_ShouldWorkAndCreateEmpty(t *testing.T) {
 	blocks, err := gbc.CreateGenesisBlocks()
 	assert.Nil(t, err)
 	assert.Equal(t, 3, len(blocks))
-	for _, block := range blocks {
-		assert.Zero(t, block.GetNonce())
-		assert.Zero(t, block.GetRound())
-		assert.Zero(t, block.GetEpoch())
+	for _, blockInstance := range blocks {
+		assert.Zero(t, blockInstance.GetNonce())
+		assert.Zero(t, blockInstance.GetRound())
+		assert.Zero(t, blockInstance.GetEpoch())
 	}
 }
diff --git a/integrationTests/api/transaction_test.go b/integrationTests/api/transaction_test.go
@@ -14,6 +14,10 @@ import (
 )
 
 func TestTransactionGroup(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	node := integrationTests.NewTestProcessorNodeWithTestWebServer(3, 0, 0)
 
 	testTransactionGasCostWithMissingFields(t, node)

diff --git a/integrationTests/benchmarks/loadFromTrie_test.go b/integrationTests/benchmarks/loadFromTrie_test.go
@@ -32,6 +32,10 @@ func TestTrieLoadTime(t *testing.T) {
 }
 
 func TestTrieLoadTimeForOneLevel(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	numTrieLevels := 1
 	numTries := 10000
 	numChildrenPerBranch := 8

diff --git a/integrationTests/chainSimulator/staking/simpleStake_test.go b/integrationTests/chainSimulator/staking/simpleStake_test.go
@@ -28,6 +28,10 @@ import (
 
 // // Internal test scenario #3
 func TestChainSimulator_SimpleStake(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	t.Run("staking ph 4 is not active", func(t *testing.T) {
 		testChainSimulatorSimpleStake(t, 1, "queued")
 	})

diff --git a/integrationTests/factory/dataComponents/dataComponents_test.go b/integrationTests/factory/dataComponents/dataComponents_test.go
@@ -13,6 +13,10 @@ import (
 )
 
 func TestDataComponents_Create_Close_ShouldWork(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	time.Sleep(time.Second * 4)
 
 	gc := goroutines.NewGoCounter(goroutines.TestsRelevantGoRoutines)

diff --git a/integrationTests/frontend/wallet/txInterception_test.go b/integrationTests/frontend/wallet/txInterception_test.go
@@ -15,6 +15,10 @@ import (
 const mintingValue = "100000000"
 
 func TestInterceptedTxWithoutDataField(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	value := big.NewInt(0)
 	value.SetString("999", 10)
 
@@ -35,6 +39,10 @@ func TestInterceptedTxWithoutDataField(t *testing.T) {
 }
 
 func TestInterceptedTxWithDataField(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	value := big.NewInt(0)
 	value.SetString("999", 10)
 
@@ -55,6 +63,10 @@ func TestInterceptedTxWithDataField(t *testing.T) {
 }
 
 func TestInterceptedTxWithSigningOverTxHash(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	value := big.NewInt(0)
 	value.SetString("1000000000000000000", 10)
 

diff --git a/integrationTests/node/getAccount/getAccount_test.go b/integrationTests/node/getAccount/getAccount_test.go
@@ -31,7 +31,9 @@ func createAccountsRepository(accDB state.AccountsAdapter, blockchain chainData.
 }
 
 func TestNode_GetAccountAccountDoesNotExistsShouldRetEmpty(t *testing.T) {
-	t.Parallel()
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
 
 	trieStorage, _ := integrationTests.CreateTrieStorageManager(testscommon.CreateMemUnit())
 	accDB, _ := integrationTests.CreateAccountsDB(0, trieStorage)
@@ -67,7 +69,9 @@ func TestNode_GetAccountAccountDoesNotExistsShouldRetEmpty(t *testing.T) {
 }
 
 func TestNode_GetAccountAccountExistsShouldReturn(t *testing.T) {
-	t.Parallel()
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
 
 	testNonce := uint64(7)
 	testBalance := big.NewInt(100)

diff --git a/integrationTests/p2p/networkSharding-hbv2/networkSharding_test.go b/integrationTests/p2p/networkSharding-hbv2/networkSharding_test.go
@@ -39,6 +39,10 @@ func createDefaultConfig() p2pConfig.P2PConfig {
 }
 
 func TestConnectionsInNetworkShardingWithShardingWithLists(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	p2pCfg := createDefaultConfig()
 	p2pCfg.Sharding = p2pConfig.ShardingConfig{
 		TargetPeerCount:         12,
@@ -54,10 +58,6 @@ func TestConnectionsInNetworkShardingWithShardingWithLists(t *testing.T) {
 }
 
 func testConnectionsInNetworkSharding(t *testing.T, p2pConfig p2pConfig.P2PConfig) {
-	if testing.Short() {
-		t.Skip("this is not a short test")
-	}
-
 	nodesPerShard := 8
 	numMetaNodes := 8
 	numObserversOnShard := 2

diff --git a/integrationTests/singleShard/smartContract/dns_test.go b/integrationTests/singleShard/smartContract/dns_test.go
@@ -13,9 +13,8 @@ import (
 )
 
 func TestDNS_Register(t *testing.T) {
-	// TODO reinstate test after Wasm VM pointer fix
 	if testing.Short() {
-		t.Skip("cannot run with -race -short; requires Wasm VM fix")
+		t.Skip("this is not a short test")
 	}
 
 	expectedDNSAddress := []byte{0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 180, 108, 178, 102, 195, 67, 184, 127, 204, 159, 104, 123, 190, 33, 224, 91, 255, 244, 118, 95, 24, 217}

diff --git a/integrationTests/state/genesisState/genesisState_test.go b/integrationTests/state/genesisState/genesisState_test.go
@@ -70,7 +70,9 @@ func TestCreationOfTheGenesisState(t *testing.T) {
 }
 
 func TestExtensionNodeToBranchEdgeCaseSet1(t *testing.T) {
-	t.Parallel()
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
 
 	tr1 := integrationTests.CreateNewDefaultTrie()
 	tr2 := integrationTests.CreateNewDefaultTrie()
@@ -105,7 +107,9 @@ func TestExtensionNodeToBranchEdgeCaseSet1(t *testing.T) {
 }
 
 func TestExtensionNodeToBranchEdgeCaseSet2(t *testing.T) {
-	t.Parallel()
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
 
 	tr1 := integrationTests.CreateNewDefaultTrie()
 	tr2 := integrationTests.CreateNewDefaultTrie()

diff --git a/integrationTests/state/stateExecTransaction/stateExecTransaction_test.go b/integrationTests/state/stateExecTransaction/stateExecTransaction_test.go
@@ -52,7 +52,9 @@ func TestExecTransaction_SelfTransactionShouldWork(t *testing.T) {
 }
 
 func TestExecTransaction_SelfTransactionWithRevertShouldWork(t *testing.T) {
-	t.Parallel()
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
 
 	trieStorage, _ := integrationTests.CreateTrieStorageManager(integrationTests.CreateMemUnit())
 	accnts, _ := integrationTests.CreateAccountsDB(0, trieStorage)
@@ -182,7 +184,6 @@ func TestExecTransaction_MoreTransactionsMoreIterationsWithRevertShouldWork(t *t
 	if testing.Short() {
 		t.Skip("this is not a short test")
 	}
-	t.Parallel()
 
 	trieStorage, _ := integrationTests.CreateTrieStorageManager(integrationTests.CreateMemUnit())
 	accnts, _ := integrationTests.CreateAccountsDB(0, trieStorage)

diff --git a/integrationTests/state/stateTrieSync/stateTrieSync_test.go b/integrationTests/state/stateTrieSync/stateTrieSync_test.go
@@ -59,6 +59,10 @@ func createTestProcessorNodeAndTrieStorage(
 }
 
 func TestNode_RequestInterceptTrieNodesWithMessenger(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	t.Run("test with double lists version", func(t *testing.T) {
 		testNodeRequestInterceptTrieNodesWithMessenger(t, 2)
 	})
@@ -180,6 +184,10 @@ func printStatistics(ctx context.Context, stats common.SizeSyncStatisticsHandler
 }
 
 func TestNode_RequestInterceptTrieNodesWithMessengerNotSyncingShouldErr(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	t.Run("test with double lists version", func(t *testing.T) {
 		testNodeRequestInterceptTrieNodesWithMessengerNotSyncingShouldErr(t, 2)
 	})

diff --git a/integrationTests/vm/delegation/changeOwner_test.go b/integrationTests/vm/delegation/changeOwner_test.go
@@ -1,5 +1,3 @@
-//go:build !race
-
 package delegation
 
 import (
@@ -23,6 +21,10 @@ var (
 )
 
 func TestDelegationChangeOwnerOnAccountHandler(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	t.Run("fix flag not activated, should not save - backwards compatibility", func(t *testing.T) {
 		_, _, userAccount := testDelegationChangeOwnerOnAccountHandler(t, 1)
 

diff --git a/integrationTests/vm/delegation/delegationMulti_test.go b/integrationTests/vm/delegation/delegationMulti_test.go
@@ -1,5 +1,3 @@
-//go:build !race
-
 package delegation
 
 import (
@@ -19,6 +17,10 @@ import (
 )
 
 func TestDelegationSystemClaimMulti(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	tpn := integrationTests.NewTestProcessorNode(integrationTests.ArgTestProcessorNode{
 		MaxShards:            1,
 		NodeShardId:          core.MetachainShardId,
@@ -127,6 +129,10 @@ func TestDelegationSystemClaimMulti(t *testing.T) {
 }
 
 func TestDelegationSystemRedelegateMulti(t *testing.T) {
+	if testing.Short() {
+		t.Skip("this is not a short test")
+	}
+
 	tpn := integrationTests.NewTestProcessorNode(integrationTests.ArgTestProcessorNode{
 		MaxShards:            1,
 		NodeShardId:          core.MetachainShardId,