diff options
| -rw-r--r-- | test/integration/container.go | 10 | ||||
| -rw-r--r-- | test/integration/oidc.go | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/test/integration/container.go b/test/integration/container.go index 1b5b282..fe14529 100644 --- a/test/integration/container.go +++ b/test/integration/container.go @@ -4,6 +4,7 @@ import ( "context" "net/url" "strconv" + "strings" "testing" "time" @@ -14,14 +15,17 @@ import ( ) func NewContainer(t *testing.T, ctx context.Context, envVars map[string]string) *testcontainers.DockerContainer { - t.Logf("mockoidc: %v %v\n", testcontainers.HostInternal, envVars) - issuer := envVars["OIDC_ISSUER"] + t.Logf("testcontainers: %v\n", testcontainers.HostInternal) + + originalIssuer := envVars["OIDC_ISSUER"] + issuer := strings.Replace(originalIssuer, "[::]", testcontainers.HostInternal, 1) + envVars["OIDC_ISSUER"] = issuer u, err := url.Parse(issuer) require.NoError(t, err) - port, err := strconv.Atoi(u.Port()) require.NoError(t, err) + t.Logf("original: %v, issuer: %v, port: %v\n", originalIssuer, issuer, port) container, err := testcontainers.Run( ctx, diff --git a/test/integration/oidc.go b/test/integration/oidc.go index 9fa465e..3a061fb 100644 --- a/test/integration/oidc.go +++ b/test/integration/oidc.go @@ -1,6 +1,7 @@ package test import ( + "net" "net/http" "testing" @@ -9,7 +10,7 @@ import ( ) func NewOIDCTestServer(t *testing.T) *mockoidc.MockOIDC { - srv, err := mockoidc.Run() + srv, err := mockoidc.NewServer(nil) require.NoError(t, err) srv.AddMiddleware(func(next http.Handler) http.Handler { @@ -19,5 +20,8 @@ func NewOIDCTestServer(t *testing.T) *mockoidc.MockOIDC { }) }) + ln, err := net.Listen("tcp", "0.0.0.0:0") + require.NoError(t, err) + require.NoError(t, srv.Start(ln, nil)) return srv } |