Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix test container not terminated everywhere. #556

Merged
merged 1 commit into from
Aug 6, 2024
Merged

Fix test container not terminated everywhere. #556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions cmd/metal-api/internal/service/machine-service_allocation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"google.golang.org/grpc/credentials/insecure"

grpcv1 "github.com/metal-stack/metal-api/pkg/api/v1"
"github.com/testcontainers/testcontainers-go"

"github.com/avast/retry-go/v4"
"github.com/emicklei/go-restful/v3"
Expand Down Expand Up @@ -52,9 +53,10 @@ var (
func TestMachineAllocationIntegration(t *testing.T) {
machineCount := 30

// Setup
rs, container := setupTestEnvironment(machineCount, t)
defer rs.Close()
rethinkContainer, container := setupTestEnvironment(machineCount, t)
defer func() {
_ = rethinkContainer.Terminate(context.Background())
}()

opts := []grpc.DialOption{
grpc.WithTransportCredentials(insecure.NewCredentials()),
Expand Down Expand Up @@ -287,10 +289,10 @@ func createMachineRegisterRequest(i int) *grpcv1.BootServiceRegisterRequest {
}
}

func setupTestEnvironment(machineCount int, t *testing.T) (*datastore.RethinkStore, *restful.Container) {
func setupTestEnvironment(machineCount int, t *testing.T) (testcontainers.Container, *restful.Container) {
log := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: slog.LevelError}))

_, c, err := test.StartRethink(t)
rethinkContainer, c, err := test.StartRethink(t)
require.NoError(t, err)

rs := datastore.New(log, c.IP+":"+c.Port, c.DB, c.User, c.Password)
Expand Down Expand Up @@ -352,7 +354,8 @@ func setupTestEnvironment(machineCount int, t *testing.T) (*datastore.RethinkSto
require.NoError(t, err)
container := restful.NewContainer().Add(ms)
container.Filter(rest.UserAuth(usergetter, log))
return rs, container

return rethinkContainer, container
}

func createTestdata(machineCount int, rs *datastore.RethinkStore, ipamer ipam.IPAMer, t *testing.T) {
Expand Down