Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'test/acceptance/config_test.go')
-rw-r--r--test/acceptance/config_test.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/test/acceptance/config_test.go b/test/acceptance/config_test.go
index 95be6e17..baa35f6e 100644
--- a/test/acceptance/config_test.go
+++ b/test/acceptance/config_test.go
@@ -11,12 +11,11 @@ import (
)
func TestEnvironmentVariablesConfig(t *testing.T) {
- envVarValue := "LISTEN_HTTP=" + net.JoinHostPort(httpListener.Host, httpListener.Port)
+ t.Setenv("LISTEN_HTTP", net.JoinHostPort(httpListener.Host, httpListener.Port))
RunPagesProcess(t,
withoutWait,
withListeners([]ListenSpec{}), // explicitly disable listeners for this test
- withEnv([]string{envVarValue}),
)
require.NoError(t, httpListener.WaitUntilRequestSucceeds(nil))
@@ -28,12 +27,11 @@ func TestEnvironmentVariablesConfig(t *testing.T) {
}
func TestMixedConfigSources(t *testing.T) {
- envVarValue := "LISTEN_HTTP=" + net.JoinHostPort(httpListener.Host, httpListener.Port)
+ t.Setenv("LISTEN_HTTP", net.JoinHostPort(httpListener.Host, httpListener.Port))
RunPagesProcess(t,
withoutWait,
withListeners([]ListenSpec{httpsListener}),
- withEnv([]string{envVarValue}),
)
for _, listener := range []ListenSpec{httpListener, httpsListener} {
@@ -48,12 +46,11 @@ func TestMixedConfigSources(t *testing.T) {
func TestMultipleListenersFromEnvironmentVariables(t *testing.T) {
listenSpecs := []ListenSpec{{"http", "127.0.0.1", "37001"}, {"http", "127.0.0.1", "37002"}}
- envVarValue := fmt.Sprintf("LISTEN_HTTP=%s,%s", net.JoinHostPort("127.0.0.1", "37001"), net.JoinHostPort("127.0.0.1", "37002"))
+ t.Setenv("LISTEN_HTTP", fmt.Sprintf("%s,%s", net.JoinHostPort("127.0.0.1", "37001"), net.JoinHostPort("127.0.0.1", "37002")))
RunPagesProcess(t,
withoutWait,
withListeners([]ListenSpec{}), // explicitly disable listeners for this test
- withEnv([]string{envVarValue}),
)
for _, listener := range listenSpecs {