diff options
| author | Jaime Martinez <jmartinez@gitlab.com> | 2021-02-01 01:28:06 +0300 |
|---|---|---|
| committer | Jaime Martinez <jmartinez@gitlab.com> | 2021-02-01 01:40:32 +0300 |
| commit | 8e57404585dfc9b1184001d44ba73e1890395821 (patch) | |
| tree | 640b1865c9c86f634e9fd71ee0dc8eca8979d303 | |
| parent | 2cb80834597f8e0d818bb28b60e3338e0a3e6acb (diff) | |
Enable IPv6 tests
| -rw-r--r-- | test/acceptance/acceptance_test.go | 16 | ||||
| -rw-r--r-- | test/acceptance/serving_test.go | 3 |
2 files changed, 8 insertions, 11 deletions
diff --git a/test/acceptance/acceptance_test.go b/test/acceptance/acceptance_test.go index ba6528c1..1b1c5d05 100644 --- a/test/acceptance/acceptance_test.go +++ b/test/acceptance/acceptance_test.go @@ -27,21 +27,19 @@ var ( // hardcoded values below. listeners = []ListenSpec{ {"http", "127.0.0.1", httpPort}, + {"http", "::1", httpPort}, {"https", "127.0.0.1", httpsPort}, + {"https", "::1", httpsPort}, {"proxy", "127.0.0.1", httpProxyPort}, + {"proxy", "::1", httpProxyPort}, {"https-proxyv2", "127.0.0.1", httpProxyV2Port}, - // TODO: re-enable IPv6 listeners once https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/12258 is resolved - // https://gitlab.com/gitlab-org/gitlab-pages/-/issues/528 - // {"http", "::1", httpPort}, - // {"https", "::1", httpsPort}, - // {"proxy", "::1", httpProxyPort}, - // {"https-proxyv2", "::1", httpProxyV2Port}, + {"https-proxyv2", "::1", httpProxyV2Port}, } httpListener = listeners[0] - httpsListener = listeners[1] - proxyListener = listeners[2] - httpsProxyv2Listener = listeners[3] + httpsListener = listeners[2] + proxyListener = listeners[4] + httpsProxyv2Listener = listeners[6] ) func TestMain(m *testing.M) { diff --git a/test/acceptance/serving_test.go b/test/acceptance/serving_test.go index 6afa9560..6cc41eff 100644 --- a/test/acceptance/serving_test.go +++ b/test/acceptance/serving_test.go @@ -521,8 +521,7 @@ func TestKnownHostInReverseProxySetupReturns200(t *testing.T) { var listeners = []ListenSpec{ proxyListener, - // TODO: re-enable https://gitlab.com/gitlab-org/gitlab-pages/-/issues/528 - // {"proxy", "::1", "37002"}, + {"proxy", "::1", httpProxyPort}, } teardown := RunPagesProcess(t, *pagesBinary, listeners, "") |