use test context

smartcontractkit · Nov 16, 2023 · ba973ba · ba973ba
1 parent afe9471
commit ba973ba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/integration-tests/docker/test_env/sol.go b/integration-tests/docker/test_env/sol.go
@@ -16,6 +16,7 @@ import (
 	"github.com/smartcontractkit/chainlink-solana/integration-tests/utils"
 	"github.com/smartcontractkit/chainlink-testing-framework/docker/test_env"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
+	"github.com/smartcontractkit/chainlink-testing-framework/utils/testcontext"
 )
 
 const (
@@ -78,7 +79,7 @@ func (s *Solana) StartContainer() error {
 	if err != nil {
 		return err
 	}
-	c, err := tc.GenericContainer(context.Background(), tc.GenericContainerRequest{
+	c, err := tc.GenericContainer(testcontext.Get(s.t), tc.GenericContainerRequest{
 		ContainerRequest: *cReq,
 		Reuse:            true,
 		Started:          true,
@@ -88,15 +89,15 @@ func (s *Solana) StartContainer() error {
 		return fmt.Errorf("cannot start Solana container: %w", err)
 	}
 	s.Container = c
-	host, err := test_env.GetHost(context.Background(), c)
+	host, err := test_env.GetHost(testcontext.Get(s.t), c)
 	if err != nil {
 		return err
 	}
-	httpPort, err := c.MappedPort(context.Background(), test_env.NatPort(SOL_HTTP_PORT))
+	httpPort, err := c.MappedPort(testcontext.Get(s.t), test_env.NatPort(SOL_HTTP_PORT))
 	if err != nil {
 		return err
 	}
-	wsPort, err := c.MappedPort(context.Background(), test_env.NatPort(SOL_WS_PORT))
+	wsPort, err := c.MappedPort(testcontext.Get(s.t), test_env.NatPort(SOL_WS_PORT))
 	if err != nil {
 		return err
 	}

diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go
@@ -1,7 +1,6 @@
 package smoke
 
 import (
-	"context"
 	"fmt"
 	"sort"
 	"testing"
@@ -17,6 +16,7 @@ import (
 	"gopkg.in/guregu/null.v4"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
+	"github.com/smartcontractkit/chainlink-testing-framework/utils/testcontext"
 	"github.com/smartcontractkit/chainlink/integration-tests/actions"
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
 	"github.com/smartcontractkit/chainlink/v2/core/services/job"
@@ -70,7 +70,7 @@ func TestSolanaGauntletOCRV2Smoke(t *testing.T) {
 
 	// Setting up RPC
 	c := rpc.New(gauntletConfig["NODE_URL"])
-	wsc, err := ws.Connect(context.Background(), gauntletConfig["WS_URL"])
+	wsc, err := ws.Connect(testcontext.Get(t), gauntletConfig["WS_URL"])
 	require.NoError(t, err)
 
 	_, err = sg.DeployOCR2()