Skip to content

Commit 6fba05e

Browse files
committed
lints + changelog
1 parent fc16638 commit 6fba05e

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

framework/.changeset/v0.9.1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Try to start EVM blockchain, JD, CL node and Postgres containers 3x

framework/components/blockchain/containers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func baseRequest(in *Input, useWS ExposeWs) testcontainers.ContainerRequest {
6464

6565
func createGenericEvmContainer(in *Input, req testcontainers.ContainerRequest, useWS bool) (*Output, error) {
6666
ctx := context.Background()
67-
c, err := framework.StartContainerWithRetry(framework.L, ctx, testcontainers.GenericContainerRequest{
67+
c, err := framework.StartContainerWithRetry(ctx, framework.L, testcontainers.GenericContainerRequest{
6868
ContainerRequest: req,
6969
Started: true,
7070
})

framework/components/clnode/clnode.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
324324
}
325325
req.KeepImage = false
326326
}
327-
c, err := framework.StartContainerWithRetry(framework.L, ctx, tc.GenericContainerRequest{
327+
c, err := framework.StartContainerWithRetry(ctx, framework.L, tc.GenericContainerRequest{
328328
ContainerRequest: req,
329329
Started: true,
330330
})

framework/components/jd/jd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ func NewJD(in *Input) (*Output, error) {
117117
req.KeepImage = false
118118
}
119119

120-
c, err := framework.StartContainerWithRetry(framework.L, ctx, tc.GenericContainerRequest{
120+
c, err := framework.StartContainerWithRetry(ctx, framework.L, tc.GenericContainerRequest{
121121
ContainerRequest: req,
122122
Started: true,
123123
})

framework/components/postgres/postgres.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func NewPostgreSQL(in *Input) (*Output, error) {
153153
}
154154
framework.ResourceLimitsFunc(h, in.ContainerResources)
155155
}
156-
c, err := framework.StartContainerWithRetry(framework.L, ctx, testcontainers.GenericContainerRequest{
156+
c, err := framework.StartContainerWithRetry(ctx, framework.L, testcontainers.GenericContainerRequest{
157157
ContainerRequest: req,
158158
Started: true,
159159
Reuse: true,

framework/docker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ var NaiveRetrier = func(l zerolog.Logger, ctx context.Context, startErr error, r
496496
// StartContainerWithRetry attempts to start a container with 3 retry attempts.
497497
// It will try to start the container with the provided retriers, if none are provided it will use the default retrier, which
498498
// simply tries to start the container again without any modifications.
499-
func StartContainerWithRetry(l zerolog.Logger, ctx context.Context, req tc.GenericContainerRequest, retriers ...StartContainerRetrier) (tc.Container, error) {
499+
func StartContainerWithRetry(ctx context.Context, l zerolog.Logger, req tc.GenericContainerRequest, retriers ...StartContainerRetrier) (tc.Container, error) {
500500
var (
501501
ct tc.Container
502502
err error

0 commit comments

Comments
 (0)