Skip to content

Commit c29ebd2

Browse files
committed
fix: start containers in e2e tests before use
1 parent 74ac091 commit c29ebd2

File tree

1 file changed

+48
-6
lines changed

1 file changed

+48
-6
lines changed

e2e_test.go

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -506,10 +506,17 @@ func startClickHouseContainer(ctx context.Context) (testcontainers.Container, er
506506
},
507507
WaitingFor: wait.ForHTTP("/").WithPort("8123/tcp"),
508508
}
509-
return testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
509+
c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
510510
ContainerRequest: req,
511511
Reuse: false,
512512
})
513+
if err != nil {
514+
return nil, err
515+
}
516+
if err := c.Start(ctx); err != nil {
517+
return nil, err
518+
}
519+
return c, nil
513520
}
514521

515522
func startMinioContainer(ctx context.Context) (testcontainers.Container, error) {
@@ -526,10 +533,17 @@ func startMinioContainer(ctx context.Context) (testcontainers.Container, error)
526533
},
527534
WaitingFor: wait.ForHTTP("/minio/health/ready").WithPort("9000/tcp").WithStartupTimeout(2 * time.Minute),
528535
}
529-
return testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
536+
c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
530537
ContainerRequest: req,
531538
Reuse: false,
532539
})
540+
if err != nil {
541+
return nil, err
542+
}
543+
if err := c.Start(ctx); err != nil {
544+
return nil, err
545+
}
546+
return c, nil
533547
}
534548

535549
func startFakeGCSContainer(ctx context.Context) (testcontainers.Container, error) {
@@ -540,10 +554,17 @@ func startFakeGCSContainer(ctx context.Context) (testcontainers.Container, error
540554
Cmd: []string{"-scheme", "http"},
541555
WaitingFor: wait.ForHTTP("/").WithPort("4443/tcp"),
542556
}
543-
return testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
557+
c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
544558
ContainerRequest: req,
545559
Reuse: false,
546560
})
561+
if err != nil {
562+
return nil, err
563+
}
564+
if err := c.Start(ctx); err != nil {
565+
return nil, err
566+
}
567+
return c, nil
547568
}
548569

549570
func startAzuriteContainer(ctx context.Context) (testcontainers.Container, error) {
@@ -554,10 +575,17 @@ func startAzuriteContainer(ctx context.Context) (testcontainers.Container, error
554575
Cmd: []string{"azurite-blob", "--blobHost", "0.0.0.0"},
555576
WaitingFor: wait.ForListeningPort("10000/tcp"),
556577
}
557-
return testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
578+
c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
558579
ContainerRequest: req,
559580
Reuse: false,
560581
})
582+
if err != nil {
583+
return nil, err
584+
}
585+
if err := c.Start(ctx); err != nil {
586+
return nil, err
587+
}
588+
return c, nil
561589
}
562590

563591
func startFTPContainer(ctx context.Context) (testcontainers.Container, error) {
@@ -572,10 +600,17 @@ func startFTPContainer(ctx context.Context) (testcontainers.Container, error) {
572600
},
573601
WaitingFor: wait.ForListeningPort("21/tcp"),
574602
}
575-
return testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
603+
c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
576604
ContainerRequest: req,
577605
Reuse: false,
578606
})
607+
if err != nil {
608+
return nil, err
609+
}
610+
if err := c.Start(ctx); err != nil {
611+
return nil, err
612+
}
613+
return c, nil
579614
}
580615

581616
func startSFTPContainer(ctx context.Context) (testcontainers.Container, error) {
@@ -588,10 +623,17 @@ func startSFTPContainer(ctx context.Context) (testcontainers.Container, error) {
588623
},
589624
WaitingFor: wait.ForListeningPort("22/tcp"),
590625
}
591-
return testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
626+
c, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
592627
ContainerRequest: req,
593628
Reuse: false,
594629
})
630+
if err != nil {
631+
return nil, err
632+
}
633+
if err := c.Start(ctx); err != nil {
634+
return nil, err
635+
}
636+
return c, nil
595637
}
596638

597639
func createTestTables(ctx context.Context, t *testing.T, container testcontainers.Container) error {

0 commit comments

Comments
 (0)