feat: add test port range Env

cartesi · Apr 17, 2024 · 99347ca · 99347ca
1 parent 771a9d2
commit 99347ca
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/internal/node/machinehash_test.go b/internal/node/machinehash_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/cartesi/rollups-node/internal/deps"
 	"github.com/cartesi/rollups-node/internal/machine"
 	"github.com/cartesi/rollups-node/pkg/addresses"
+	"github.com/cartesi/rollups-node/pkg/testutil"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/suite"
 )
@@ -139,7 +140,7 @@ func startDevnet() (*deps.DepsContainers, error) {
 			DockerImage:             deps.DefaultDevnetDockerImage,
 			BlockTime:               deps.DefaultBlockTime,
 			BlockToWaitForOnStartup: deps.DefaultBlockToWaitForOnStartup,
-			Port:                    "",
+			Port:                    testutil.GetCartesiTestDepsPortRange(),
 		},
 	})
 	if err != nil {

diff --git a/pkg/ethutil/ethutil_test.go b/pkg/ethutil/ethutil_test.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/cartesi/rollups-node/internal/deps"
 	"github.com/cartesi/rollups-node/pkg/addresses"
+	"github.com/cartesi/rollups-node/pkg/testutil"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/suite"
@@ -97,7 +98,7 @@ func newDevNetContainer(ctx context.Context) (*deps.DepsContainers, error) {
 			DockerImage:             deps.DefaultDevnetDockerImage,
 			BlockTime:               deps.DefaultBlockTime,
 			BlockToWaitForOnStartup: deps.DefaultBlockToWaitForOnStartup,
-			Port:                    "",
+			Port:                    testutil.GetCartesiTestDepsPortRange(),
 		},
 	})
 	if err != nil {

diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go
@@ -0,0 +1,12 @@
+// (c) Cartesi and individual authors (see AUTHORS)
+// SPDX-License-Identifier: Apache-2.0 (see LICENSE)
+
+// This package contains tests utilities.
+
+package testutil
+
+import "os"
+
+func GetCartesiTestDepsPortRange() string {
+	return os.Getenv("CARTESI_TEST_DEPS_PORT_RANGE")
+}
diff --git a/test/echo_test.go b/test/echo_test.go
@@ -22,6 +22,7 @@ import (
 	"github.com/cartesi/rollups-node/internal/node"
 	"github.com/cartesi/rollups-node/pkg/ethutil"
 	"github.com/cartesi/rollups-node/pkg/readerclient"
+	"github.com/cartesi/rollups-node/pkg/testutil"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -63,12 +64,12 @@ func (s *EchoInputTestSuite) SetupTest() {
 	var depsConfig = deps.DepsConfig{
 		&deps.PostgresConfig{
 			DockerImage: deps.DefaultPostgresDockerImage,
-			Port:        "",
+			Port:        testutil.GetCartesiTestDepsPortRange(),
 			Password:    deps.DefaultPostgresPassword,
 		},
 		&deps.DevnetConfig{
 			DockerImage:             deps.DefaultDevnetDockerImage,
-			Port:                    "",
+			Port:                    testutil.GetCartesiTestDepsPortRange(),
 			BlockTime:               devNetMiningBlockTimeInSeconds,
 			BlockToWaitForOnStartup: deps.DefaultBlockToWaitForOnStartup,
 		},