From c6b4a8ce874706417e53f48ff29f8907c4b28d1f Mon Sep 17 00:00:00 2001 From: mo khan Date: Wed, 14 May 2025 13:34:55 -0600 Subject: test: use host network mode locally and in CI --- test/integration/ci.go | 2 +- test/integration/container.go | 22 +++++++++++----------- test/integration/container_test.go | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'test') diff --git a/test/integration/ci.go b/test/integration/ci.go index 5d34685..7b5280f 100644 --- a/test/integration/ci.go +++ b/test/integration/ci.go @@ -7,6 +7,6 @@ import ( ) func isGitlabCI(t *testing.T) bool { - t.Logf("CI? %v", env.Fetch("CI", "")) + t.Logf("CI? %v\n", env.Fetch("CI", "")) return env.Fetch("CI", "") == "true" } diff --git a/test/integration/container.go b/test/integration/container.go index 3929697..794702d 100644 --- a/test/integration/container.go +++ b/test/integration/container.go @@ -54,18 +54,18 @@ func containerOptions(t *testing.T, envVars map[string]string) []testcontainers. ), } - if isGitlabCI(t) { - options = append(options, testcontainers.WithHostConfigModifier(func(cfg *xcontainer.HostConfig) { - cfg.NetworkMode = xcontainer.NetworkMode(network.NetworkHost) - })) - } else { - issuer, port := normalizeIssuer(t, envVars["OIDC_ISSUER"]) - // envVars["OIDC_ISSUER"] = issuer - t.Logf("issuer: %v, port: %v\n", issuer, port) + // if isGitlabCI(t) { + options = append(options, testcontainers.WithHostConfigModifier(func(cfg *xcontainer.HostConfig) { + cfg.NetworkMode = xcontainer.NetworkMode(network.NetworkHost) + })) + // } else { + // issuer, port := normalizeIssuer(t, envVars["OIDC_ISSUER"]) + // // envVars["OIDC_ISSUER"] = issuer + // t.Logf("issuer: %v, port: %v\n", issuer, port) - options = append(options, testcontainers.WithExposedPorts("8080/tcp", "9901/tcp", "10000/tcp")) - options = append(options, testcontainers.WithHostPortAccess(port)) - } + // options = append(options, testcontainers.WithExposedPorts("8080/tcp", "9901/tcp", "10000/tcp")) + // options = append(options, testcontainers.WithHostPortAccess(port)) + // } return options } diff --git a/test/integration/container_test.go b/test/integration/container_test.go index 6d48beb..0c5aab7 100644 --- a/test/integration/container_test.go +++ b/test/integration/container_test.go @@ -91,7 +91,7 @@ func TestContainer(t *testing.T) { assert.True(t, response.Ok()) require.NoError(t, page.GetByText("Login").Click()) - assert.Equal(t, srv.AuthorizationEndpoint()+"?client_id="+srv.Config().ClientID, page.URL()) + assert.Contains(t, page.URL(), srv.AuthorizationEndpoint()+"?client_id="+srv.Config().ClientID) }) }) } -- cgit v1.2.3