Skip to content

Commit

Permalink
fix: test validator should point to separate ledger directories
Browse files Browse the repository at this point in the history
  • Loading branch information
aalu1418 committed Feb 13, 2024
1 parent c4d342b commit 7d9a0fa
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions pkg/solana/client/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package client

import (
"bytes"
"context"
"os/exec"
"testing"
"time"
Expand All @@ -13,6 +12,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/smartcontractkit/chainlink-common/pkg/utils"
"github.com/smartcontractkit/chainlink-common/pkg/utils/tests"
)

// SetupLocalSolNode sets up a local solana node via solana cli, and returns the url
Expand All @@ -24,6 +24,7 @@ func SetupLocalSolNode(t *testing.T) string {
"--reset",
"--rpc-port", port,
"--faucet-port", faucetPort,
"--ledger", t.TempDir(),
)
var stdErr bytes.Buffer
cmd.Stderr = &stdErr
Expand All @@ -34,7 +35,7 @@ func SetupLocalSolNode(t *testing.T) string {
assert.NoError(t, cmd.Process.Kill())
if err2 := cmd.Wait(); assert.Error(t, err2) {
if !assert.Contains(t, err2.Error(), "signal: killed", cmd.ProcessState.String()) {
t.Log("solana-test-validator stderr:", stdErr.String())
t.Logf("solana-test-validator\n stdout: %s\n stderr: %s", stdOut.String(), stdErr.String())
}
}
})
Expand All @@ -44,7 +45,7 @@ func SetupLocalSolNode(t *testing.T) string {
for i := 0; i < 30; i++ {
time.Sleep(time.Second)
client := rpc.New(url)
out, err := client.GetHealth(context.Background())
out, err := client.GetHealth(tests.Context(t))
if err != nil || out != rpc.HealthOk {
t.Logf("API server not ready yet (attempt %d)\n", i+1)
continue
Expand Down

0 comments on commit 7d9a0fa

Please sign in to comment.